[SCM] live-manual branch, upstream, updated. upstream/2.0_a8-1-geece9c5

Daniel Baumann daniel at debian.org
Mon Oct 25 21:53:48 UTC 2010


The following commit has been merged in the upstream branch:
commit eece9c511cf319d0fca4256226613ec93733bc5f
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Oct 25 23:53:24 2010 +0200

    Adding upstream version 2.0~a9.

diff --git a/VERSION b/VERSION
index 9eaada7..191f5f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a8
+2.0~a9
diff --git a/html/index.html b/html/index.html
index be3395b..158d574 100644
--- a/html/index.html
+++ b/html/index.html
@@ -10,6 +10,9 @@
 	<ul>
 		<li><a href="en"><b>English</b></a></li>
 		<li><a href="de">Deutsch (German)</a></li>
+		<li><a href="fr">Fran&ccedil;ais (French)</a></li>
+		<li><a href="pt_BR">Portugu&ecirc;s (Portuguese)</a></li>
+		<li><a href="ro">Rom&acirc;n&acaron; (Romanian)</a></li>
 	</ul>
 
 	<p>
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 8506689..3b69378 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -14,20 +14,20 @@ unprivileged user and those requiring superuser privileges, commands are
 prepended by #{$}# or #{#}# respectively. This symbol is not a part of the
 command.
 
-2~ Terms
+2~terms Terms
 
 _* *{Live system}*: An operating system that can boot without installation
 to a hard drive. Live systems do not alter local operating system(s) or
 file(s) already installed on the computer hard drive unless instructed to do
-so. Live systems are typically booted from media such as CDs/DVDs or USB
-sticks, some may also boot over the network.
+so. Live systems are typically booted from media such as CDs, DVDs or USB
+sticks. Some may also boot over the network.
 
 _* *{Debian Live}*: The Debian sub-project which maintains the live-boot,
 live-build, live-config, and live-manual packages.
 
 _* *{Debian Live system}*: A live system that uses software from the Debian
 operating system that may be booted from CDs, DVDs, USB sticks, over the
-network (via netboot images), and over the internet (via boot parameter
+network (via netboot images), and over the Internet (via boot parameter
 #{fetch=URL}#).
 
 _* *{Host system}*: The environment used to create the live system.
@@ -37,17 +37,17 @@ _* *{Target system}*: The environment used to run the live system.
 _* *{live-boot}*: A collection of scripts used to boot live
 systems. live-boot was formerly a part of live-initramfs.
 
-_* *{live-build}*: A collection of scripts used to build customised Debian
-Live systems. live-build was formerly know as live-helper, and even earlier
-know as live-package.
+_* *{live-build}*: A collection of scripts used to build customized Debian
+Live systems. live-build was formerly known as live-helper, and even earlier
+known as live-package.
 
-_* *{live-config}*: A collection of scripts used to configure a live systems
+_* *{live-config}*: A collection of scripts used to configure a live system
 during the boot process. live-config was formerly a part of live-initramfs.
 
 _* *{live-manual}*: This document is maintained in a package called
 live-manual.
 
-_* *{Debian Installer/(d-i)}*: The official installation system for the
+_* *{Debian Installer (d-i)}*: The official installation system for the
 Debian distribution.
 
 _* *{Boot parameters}*: Parameters that can be entered at the bootloader
@@ -57,13 +57,13 @@ _* *{chroot}*: The chroot program, chroot(8), enables us to run different
 instances of the GNU/Linux environment on a single system simultaneously
 without rebooting.
 
-_* *{Binary image}*: On a live system, binary image refers to the binary
-filesystem and the respective extension, such as binary.iso or binary.img.
+_* *{Binary image}*: A file containing the live system, such as binary.iso
+or binary.img.
 
 _* *{Target distribution}*: The distribution upon which your live system
-will be based. This can differ from the distribution of your Build System.
+will be based. This can differ from the distribution of your host system.
 
-_* *{squeeze/wheezy/sid stable/testing/unstable}*: The stable distribution
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution
 contains the latest officially released distribution of Debian. The testing
 distribution is the staging area for the next stable release. A major
 advantage of using this distribution is that it has more recent versions of
@@ -71,8 +71,8 @@ software relative to the stable release. The unstable distribution is where
 active development of Debian occurs. Generally, this distribution is run by
 developers and those who like to live on the edge.
 
-At the time of writing, squeeze is the current stable release and wheezy is
-the current testing release. sid will always be a synonym for the unstable
+At the time of writing, Squeeze is the current stable release and Wheezy is
+the current testing release. Sid will always be a synonym for the unstable
 release.
 
 2~ Authors
@@ -107,15 +107,13 @@ _* Trent W. Buck
 
 This manual is intended as a community project and all proposals for
 improvements and contributions are extremely welcome. The preferred way to
-submit a contribution is to send it to the mailing list. Please see contact
-for more information.
+submit a contribution is to send it to the mailing list. Please see
+{Contact}#contact for more information.
 
-% FIXME: <xref linkend="contact"/>
-
-When submitting a contribution please clearly identify its copyright holder
-and include the licensing statement. Note that to be accepted the
+When submitting a contribution, please clearly identify its copyright holder
+and include the licensing statement. Note that to be accepted, the
 contribution must be licensed under the same license as the rest of the
-document, namely GPL version 3 or later.
+document, namely, GPL version 3 or later.
 
 The sources for this manual are maintained using the Git version control
 system. You can checkout the latest copy by executing:
@@ -132,7 +130,7 @@ installed by executing:
 
 code{
 
-# apt-get install sisu-complete
+# apt-get install make po4a sisu-complete
 
 }code
 
@@ -148,19 +146,19 @@ $ make build
 3~ Applying patches
 
 Directly commiting to the repository is possible by anyone. However, we ask
-you to send bigger changes to the mailinglist to discuss them first. In
+you to send bigger changes to the mailing list to discuss them first. In
 order to push to the repository, the following steps are required.
 
 _* Fetch the public commit key:
 
 code{
 
-$ mkdir -p ~/.ssh/identity.d $ wget
-http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live
--O ~/.ssh/identity.d/live-manual at debian-live $ wget
-http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub
--O ~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600
-~/.ssh/identity.d/live-manual at debian-live*
+$ mkdir -p ~/.ssh/identity.d
+$ wget http://live.debian.net/other/keys/live-manual@debian-live \
+	-O ~/.ssh/identity.d/live-manual at debian-live
+$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \
+	-O ~/.ssh/identity.d/live-manual at debian-live.pub
+$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*
 
 }code
 
@@ -186,7 +184,7 @@ $ git clone gitosis at live.debian.net:/live-manual.git
 }code
 
 _* After editing the files in manual/en/, please call the 'commit' target in
-the toplevel directory to sanitize the files and update the translation
+the top level directory to sanitize the files and update the translation
 files:
 
 code{
diff --git a/manual/de/about_project.ssi b/manual/de/about_project.ssi
index 993ea07..15fd20c 100644
--- a/manual/de/about_project.ssi
+++ b/manual/de/about_project.ssi
@@ -73,20 +73,18 @@ are after a regular installation of Debian.
 Whenever we need a different default configuration, we will do that in
 coordination with its package maintainer in Debian.
 
-A system for configuring packages is provided using debconf in #{lh config}#
+A system for configuring packages is provided using debconf in #{lb config}#
 (use --preseed FILE) allowing custom configured packages to be installed in
 your custom produced Debian Live images, but for official live images only
 default configuration will be used. For more information, please see
-customization.
-
-% FIXME: <xref linkend="customization"/>
+{Customization overview}#customization-overview.
 
 Exception: There are a few essential changes needed to bring a live system
 to life (e.g. configuring pam to allow empty passwords). These essential
 changes have to be kept as minimal as possible and should be merged within
 the Debian repository if possible.
 
-2~ Contact
+2~contact Contact
 
 _* *{Mailing list}*: The primary contact for the project is the mailing list
 at http://lists.debian.org/debian-live/. You can email the list directly by
@@ -101,9 +99,7 @@ list.
 _* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs
 reported by users and developers. Each bug is given a number, and is kept on
 file until it is marked as having been dealt with. For more information,
-please see bugs.
-
-% FIXME: <xref linkend="bugs"/>
+please see {Reporting bugs}#bugs.
 
 _* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a
 place to gather information, discuss applied technologies, and document
diff --git a/manual/de/index.html.in b/manual/de/index.html.in
index 21d05ba..79f39c0 100644
--- a/manual/de/index.html.in
+++ b/manual/de/index.html.in
@@ -2,6 +2,7 @@
 
 <head>
 	<title>Debian Live Projekt</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 </head>
 
 <body>
@@ -16,8 +17,8 @@
 unter <a
 href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
 (englischspraching) gemeldet werden. Informationen wie man <a
-href="html/meta.html#contributing">zum Handbuch beitragen</a> kann, können
-im Handbuch gefunden werden.
+href="html/1.html#37">zum Handbuch beitragen</a> kann, können im Handbuch
+gefunden werden.
 	</p>
 
 	<h3>Verfügbare Formate</h3>
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index d27d569..ac5702c 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,12 +9,12 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-10-03
+ :published: 2010-10-25
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
 @make:
- :bold: /lenny|stable|squeeze|testing|sid|unstable/
+ :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
  :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
  :num_top: 1
  :skin: skin_debian-live
@@ -35,46 +35,56 @@
 
 << user_overview.ssi
 
+<< user_managing_a_configuration.ssi
+
+<< user_customization-overview.ssi
+
 << user_customization-packages.ssi
 
 << user_customization-contents.ssi
 
+<< user_customization-internationalization.ssi
+
 :B~ Development ~#
 
 :B~ Project ~#
 
-:B~ Other ~#
+<< project_bugs.ssi
 
-<< other_customization-internationalization.ssi
+:B~ Other ~#
 
-<< other_customization-bootup.ssi
+Other material that formerly appeared in this section is out of date and/or
+has not been approved for release. It has therefore been omitted, but can
+still be found in the document source; see 'About this manual'. Any part of
+the omitted material that is still useful will be included in the release
+only after it has been reviewed.
 
-<< other_customization-binary.ssi
+% << other_customization-bootup.ssi
 
-<< other_customization-backports.ssi
+% << other_customization-binary.ssi
 
-<< other_common-tasks.ssi
+% << other_customization-backports.ssi
 
-<< other_live-environment.ssi
+% << other_common-tasks.ssi
 
-<< other_faq.ssi
+% << other_live-environment.ssi
 
-<< other_reporting-bugs.ssi
+% << other_faq.ssi
 
-<< other_howtos.ssi
+% << other_howtos.ssi
 
-<< other_coding-style.ssi
+% << other_coding-style.ssi
 
-<< other_procedures.ssi
+% << other_procedures.ssi
 
-<< other_resources.ssi
+% << other_resources.ssi
 
-<< other_use-cases.ssi
+% << other_use-cases.ssi
 
-<< other_success-stories.ssi
+% << other_success-stories.ssi
 
-<< other_troubleshooting.ssi
+% << other_troubleshooting.ssi
 
-<< other_configuration-layout.ssi
+% << other_configuration-layout.ssi
 
-<< other_configuration-files.ssi
+% << other_configuration-files.ssi
diff --git a/manual/de/other_common-tasks.ssi b/manual/de/other_common-tasks.ssi
index d93643b..98cb5d7 100644
--- a/manual/de/other_common-tasks.ssi
+++ b/manual/de/other_common-tasks.ssi
@@ -26,7 +26,7 @@ This means that Debian is installed by fetching and installing
 from the local media or some network-base network, resulting in a standard
 Debian system being installed to the hard disk.
 
-This whole process can be preseeded and customised in a number of ways; see
+This whole process can be preseeded and customized in a number of ways; see
 the relevant "DebianInstaller" wiki page and installation guide for
 more. This is operational now withing live-helper.
 
diff --git a/manual/de/other_customization-binary.ssi b/manual/de/other_customization-binary.ssi
index 097216f..c717f53 100644
--- a/manual/de/other_customization-binary.ssi
+++ b/manual/de/other_customization-binary.ssi
@@ -1,6 +1,6 @@
-B~ Customising the binary image
+B~ Customizing the binary image
 
-1~ Customising the binary image<
+1~ Customizing the binary image<
 
 2~ ISO metadata
 
diff --git a/manual/de/other_customization-bootup.ssi b/manual/de/other_customization-bootup.ssi
index f656968..4fc11a7 100644
--- a/manual/de/other_customization-bootup.ssi
+++ b/manual/de/other_customization-bootup.ssi
@@ -1,8 +1,8 @@
-B~ Customising the bootup process
+B~ Customizing the bootup process
 
-1~ Customising the bootup process
+1~ Customizing the bootup process
 
-This chapter discusses customisation of bootup process of a live system,
+This chapter discusses customization of bootup process of a live system,
 including kernel options, modifications to the bootloader, "splash" screens
 and startup scripts.
 
diff --git a/manual/de/other_customization-internationalization.ssi b/manual/de/other_customization-internationalization.ssi
deleted file mode 100644
index 445a3e1..0000000
--- a/manual/de/other_customization-internationalization.ssi
+++ /dev/null
@@ -1,57 +0,0 @@
-B~ Customising Locale And Language
-
-1~ Customising Locale And Language
-
-2~ Default locale and keyboard
-
-The default locale when building a live cd is "locale=en_US.UTF-8". To set
-the locale for the UK (locale=en_GB.UTF-8)
-
-code{
-
-$ lh_config --bootappend-live "locale=en_GB.UTF-8"
-
-}code
-
-The entry for a British keyboard would be
-
-code{
-
-$ lh_config --bootappend-live "keyb=uk"
-
-}code
-
-To configure both the locale and the keyboard for the UK the entry would be
-
-code{
-
-$ lh_config --bootappend-live "locale=en_GB.UTF-8 keyb=uk"
-
-}code
-
-or
-
-code{
-
-$ lh_config --bootappend-live "locale=uk"
-
-}code
-
-Note: You can find a list of options in the manpage for live-initramfs. Only
-UTF8 locales are supported by live-initramfs.
-
-2~ l10n Packages
-
-lh build can automatically check for each package, for which it's know that
-there are -l10n packages available and install them. To add Swedish packages
-the entry would be
-
-code{
-
-$ lh_config --language "se"
-
-}code
-
-This will also change the default syslinux language if
-#{config/templates/syslinux/se}# is available. Check syslinux configuration
-FIXME
diff --git a/manual/de/other_faq.ssi b/manual/de/other_faq.ssi
index 8df1daf..f754913 100644
--- a/manual/de/other_faq.ssi
+++ b/manual/de/other_faq.ssi
@@ -183,7 +183,7 @@ You must also use the example script
 script gets built into the initramfs (read the comment header for
 instructions).
 
-Q: How do I add software not in Debian ? A: See Customising package
+Q: How do I add software not in Debian ? A: See Customizing package
 installation % FIXME: <xref linkend="packages"/>
 
 Q: What is the manifest with Ubuntu used for? A: Manifest is just the
@@ -288,7 +288,7 @@ Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref
 linkend="internalization"/>
 
 Q: How do I get past boot prompt without a working keyboard? A: See
-Customising the bootup process % FIXME: <xref linkend="bootup"/> Note: Boot
+Customizing the bootup process % FIXME: <xref linkend="bootup"/> Note: Boot
 from an USB-HDD on an iMac with GRUB did not work.
 
 Q: Can I serve the root image from a web or ftp server? A: Since
diff --git a/manual/de/other_reporting-bugs.ssi b/manual/de/project_bugs.ssi
similarity index 63%
copy from manual/de/other_reporting-bugs.ssi
copy to manual/de/project_bugs.ssi
index cf0c72a..c82d6cf 100644
--- a/manual/de/other_reporting-bugs.ssi
+++ b/manual/de/project_bugs.ssi
@@ -1,6 +1,6 @@
 B~ Reporting bugs
 
-1~ Reporting bugs
+1~bugs Reporting bugs
 
 Debian Live is far from being perfect, but we want to make it as close as
 possible to perfect - with your help. Do not hesitate to report a bug: it is
@@ -12,30 +12,30 @@ For the impatient:
 _* Always check first the image status updates on our homepage at
 http://live.debian.net/ for known issues.
 
-_* Always try to reproduce the bug with the *{most recent version}* of
-live-helper and live-initramfs before submitting a bug report.
+_* Always try to reproduce the bug with the *{most recent versions}* of
+live-build, live-boot, and live-config before submitting a bug report.
 
 _* Try to give *{as specific information as possible}* about the bug. This
-includes (at least) the version of live-helper and live-initramfs used and
-the distribution of the live system you are building.
+includes (at least) the version of live-build, live-boot, and live-config
+used and the distribution of the live system you are building.
 
 2~ Known issues
 
-Due to the nature of Debian testing and Debian unstable branches being a
-moving target, building a live system may not always be possible.
+Due to the nature of Debian testing and Debian unstable distributions being
+a moving target, building a live system may not always be possible.
 
 If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-helper does always default to the current stable
+but go with stable. live-build does always default to the current stable
 release.
 
 Currently known issues are listed under the section 'status' on our homepage
 at http://live.debian.net/
 
 It is out of the scope of this manual to train you in correctly identifying
-and fixing problems in packages of the development branches, however, there
-are two things you can always try: When not succeeding to build testing, try
-if unstable works. If unstable does not work either, revert to testing and
-pinning the newer version of the failing package from unstable.
+and fixing problems in packages of the development distributions, however,
+there are two things you can always try: When not succeeding to build
+testing, try if unstable works. If unstable does not work either, revert to
+testing and pinning the newer version of the failing package from unstable.
 
 2~ Rebuild from scratch
 
@@ -46,15 +46,12 @@ is reproducible.
 2~ Use up-to-date packages
 
 Using outdated packages can cause significant problems when trying to
-reproduce (and ultimately fix) your problem. If a relevant package is not
-available in Debian anymore, please recognize that the resources of the
-Debian kernel team are limited and will be unlikely to be able to fix the
-problem.
+reproduce (and ultimately fix) your problem.
 
-2~ Collect information
+2~collect-information Collect information
 
 Please provide enough information with your report. At a minimum, it should
-contain the exact version of live-helper version where the bug is
+contain the exact version of live-build version where the bug is
 encountered, and steps to reproduce it. Please use common sense and include
 other relevant information if you think that it might help in solving the
 problem.
@@ -64,9 +61,11 @@ information:
 
 _* Architecture of the host system
 
-_* Version of live-helper on the host system
+_* Version of live-build on the host system
+
+_* Version of live-boot on the live system
 
-_* Version of live-initramfs on the live system
+_* Version of live-config on the live system
 
 _* Version of debootstrap and/or cdebootstrap on the host system
 
@@ -78,7 +77,11 @@ _* Version of the kernel on the live system
 
 You can generate a log of the build process by using the tee command:
 
-% code{ % % lh_build 2>&1 | tee buildlog.txt % % }code
+code{
+
+lb build 2>&1 | tee build.log
+
+}code
 
 Additionally, to rule out other errors, it is always a good idea to tar up
 your config directory and upload it somewhere (do *{not}* send it as an
@@ -86,7 +89,7 @@ attachment to the mailinglist), so that we can try to reproduce the errors
 you encountered.
 
 Remember to send in any logs that were produced with English locale
-settings, e.g. run your live-helper commands with a leading #{LC_ALL=C}# or
+settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or
 #{LC_ALL=en_US}#.
 
 2~ Use the correct package to report the bug against
@@ -95,26 +98,26 @@ Where does the bug appear?
 
 3~ At build time whilst bootstrapping
 
-live-helper first bootstraps a basic Debian system with #{debootstrap}# or
+live-build first bootstraps a basic Debian system with #{debootstrap}# or
 #{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian
 distribution it is bootstrapping, it may fail. If a bug appears here, check
 if the error is related to a specific Debian package (most likely), or if it
-is related to cdebootstrap itself.
+is related to bootstrapping tool itself.
 
 In both cases, this is not a bug in Debian Live, but rather in Debian itself
-which we can not fix this directly. Please report such a bug against
-#{debootstrap}#, #{cdebootstrap}# or the failing package.
+which we can not fix this directly. Please report such a bug against the
+bootstrapping tool or the failing package.
 
 3~ At build time whilst installing packages
 
-live-helper installs additional packages from the Debian archive and
+live-build installs additional packages from the Debian archive and
 depending on the Debian distribution used and the daily archive state, it
 can fail. If a bug appears here, check if the error is also reproducible on
 a normal system.
 
 If this is the case, this is not a bug in Debian Live, but rather in Debian
 - please report it against the failing package. Running debootstrap
-seperately from the Live system build or running lh_bootstrap with
+seperately from the Live system build or running lb bootstrap with
 #{--debug}# will give you more information.
 
 Also, if you are using a local mirror and/or any of sort of proxy and you
@@ -124,11 +127,12 @@ bootstrapping from an official mirror.
 3~ At boot-time
 
 If your image does not boot, please report it to the mailing list together
-with the information requested in collect-information. Do not forget to
-mention, how/when the image failed, in Qemu, VMWare or real hardware. If you
-are using a virtualization technology of any kind, please always run it on
-real hardware before reporting a bug. Providing a screenshot of the failure
-is also very helpful.  % FIXME: <xref linkend="collect-information"/>
+with the information requested in {Collect
+information}#collect-information. Do not forget to mention, how/when the
+image failed, in Qemu, VMWare or real hardware. If you are using a
+virtualization technology of any kind, please always run it on real hardware
+before reporting a bug. Providing a screenshot of the failure is also very
+helpful.
 
 3~ At run-time
 
@@ -148,9 +152,9 @@ as the homepage, as these are likely to contain the most up-to-date
 information. If such information exists, always include the references to it
 in your bug report.
 
-In addition, you should check the current bug list for live-helper and the
-current bug list for live-initramfs at to see whether something similar has
-been reported already.
+In addition, you should check the current bug lists for live-build,
+live-boot, and live-config to see whether something similar has been
+reported already.
 
 2~ Where to report bugs
 
@@ -159,13 +163,12 @@ System (BTS). For information on how to use the system, please see
 http://bugs.debian.org/. You can also submit the bugs by using the
 #{reportbug}# command from the package with the same name.
 
-In general, you should report build time errors against the live-helper
-package and run time errors against live-initramfs. If you are unsure of
-which package is appropriate or need more help before submitting a bug
-report, please send a message to the mailing list and we will help you to
-figure it out.
+In general, you should report build time errors against the live-build
+package, boot time errors against live-boot, and run time errors against
+live-config. If you are unsure of which package is appropriate or need more
+help before submitting a bug report, please send a message to the mailing
+list and we will help you to figure it out.
 
 Please note that bugs found in distributions derived from Debian (such as
-Ubuntu, Knoppix, Xandros, etc.) should *{not}* be reported to the Debian BTS
-unless they can be also reproduced on a Debian system using official Debian
-packages.
+Ubuntu and others) should *{not}* be reported to the Debian BTS unless they
+can be also reproduced on a Debian system using official Debian packages.
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index f9b0843..aef09b7 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -10,9 +10,7 @@ containing instructions on how to boot the various binary image types.
 A live system usually means an operating system booted on a computer from a
 removable medium (such as CD-ROM, USB stick, or network), ready to use
 without any installation on the usual drive(s), with an auto-configuration
-done at runtime (see terms).
-
-% FIXME: <xref linkend="terms"/>
+done at runtime (see {Terms}#terms ).
 
 With Debian Live, it's a Debian GNU/Linux operating system, built for one of
 the supported architectures (currently amd64, i386, powerpc and sparc). It
@@ -26,8 +24,8 @@ _* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
 containing modules possibly needed to mount the filesystem's image and some
 scripts to do it.
 
-_* *{System image}*: The operating systems filesystem image. Debian Live
-uses SquashFS, a compressed filesystem, to minimize its image size. Note
+_* *{System image}*: The operating systems filesystem image. The SquashFS
+compressed filesystem is used to minimize the Debian Live image size. Note
 that it's read-only. So, during boot the Debian Live system will use a RAM
 disk and 'union' mechanism to enable writing files within the running
 system. However, all modifications will be lost upon shutdown unless
@@ -65,9 +63,7 @@ $ lb config
 }code
 
 By passing no parameters to #{lb config}# we indicated that we wish to use
-the defaults (see lb-config).
-
-% FIXME: <xref linkend="lb-config"/>
+the defaults (see {The lb config command}#lb-config ).
 
 Now that we have a "config/" hierarchy, we may build the image with the lb
 build command:
@@ -79,9 +75,7 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network
-connection (see lb-build).
-
-% FIXME: <xref linkend="lb-build"/>
+connection (see {The lb build command}#lb-build ).
 
 3~ Testing an ISO image with Qemu
 
@@ -111,6 +105,19 @@ build the required kernel modules to run virtualbox-ose.
 After successful installation, virtualbox can be e.g. found in the GNOME
 menu under 'Applications/System Tools/VirtualBox OSE'.
 
+Please consider including of following packages onto the live image to
+achieve higher resolution of the display when booting the live image in
+virutalbox-ose (1280x1024 instead of 800x600 and in particular if the
+default resolution of the virtualbox-ose display shouldn't work with the
+gui-installer).
+
+code{
+
+virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
+virtualbox-ose-guest-x11
+
+}code
+
 3~ Burning an ISO image to a physical medium
 
 Burning an ISO image is easy:
@@ -131,9 +138,8 @@ booting from USB sticks, USB hard drives, and various other portable storage
 devices.
 
 Note if you created an iso image with the previous example, you will need to
-clean up your working directory with the #{lb clean} command (see lb-clean):
-
-% FIXME: <xref linkend="lb-clean"/>
+clean up your working directory with the #{lb clean} command (see {The lb
+clean command}#lb-clean ):
 
 code{
 
@@ -321,7 +327,7 @@ code{
 
 dpkg-reconfigure -plow tftpd-hpa
 
-code}
+}code
 
 and fill in the new tftp server directory when being asked about it.
 
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index 7c43045..df28e53 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -1,8 +1,8 @@
-B~ Customising contents
+B~ Customizing contents
 
-1~ Customising contents
+1~customizing-contents Customizing contents
 
-This chapter discusses further customisation of the live system.
+This chapter discusses further customization of the live system.
 
 2~ Includes
 
diff --git a/manual/de/user_customization-internationalization.ssi b/manual/de/user_customization-internationalization.ssi
new file mode 100644
index 0000000..beb134a
--- /dev/null
+++ b/manual/de/user_customization-internationalization.ssi
@@ -0,0 +1,49 @@
+B~ Customizing locale and language
+
+1~customizing-locale-and-language Customizing locale and language
+
+2~ Default locale and keyboard
+
+The default locale when building a live cd is "locales=en_US.UTF-8", to set
+the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
+
+code{
+
+$ lb config --bootappend-live "locales=de_CH.UTF-8"
+
+}code
+
+The entry for a Swiss-German keyboard would be:
+
+code{
+
+$ lb config --bootappend-live "keyboard-layouts=ch"
+
+}code
+
+Combined, the keyboard and locale configured for Switzerland would be:
+
+code{
+
+$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
+
+}code
+
+Note: You can find a list of options in the manpage for
+live-config. Currently, only UTF-8 locales are supported.
+
+2~ l10n Packages
+
+An experimental feature of live-build is to automatically check for each
+package for which it is know that there are -l10n packages available and
+install them. To add German packages the entry would be
+
+code{
+
+$ lb config --language "de"
+
+}code
+
+This will also change the default syslinux language if translations are
+available or local translations have been put into
+#{config/templates/syslinux/de}#.
diff --git a/manual/de/user_customization-overview.ssi b/manual/de/user_customization-overview.ssi
new file mode 100644
index 0000000..517ca3d
--- /dev/null
+++ b/manual/de/user_customization-overview.ssi
@@ -0,0 +1,13 @@
+B~ Customizing contents
+
+1~customization-overview Customization overview
+
+% FIXME: just a stub for now.  In conversational style, cover the different
+kinds of customization % and link to each section within the text.
+
+This chapter gives an overview of the various ways in which your Debian live
+systems may be customized. See sections {Customizing package
+installation}#customizing-package-installation, {Customizing
+contents}#customizing-contents and {Customizing locale and
+language}#customizing-locale-and-language.
+
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index b848d7f..29fb5eb 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -1,6 +1,6 @@
-:B~ Customising package installation
+:B~ Customizing package installation
 
-1~ Customising package installation
+1~customizing-package-installation Customizing package installation
 
 _* Selecting additional packages to be installed
 
@@ -174,6 +174,17 @@ in order to be processed. Local packages lists always override package lists
 distributed with live-build. This can cause undesired effects, we therefore
 recommend to use unique names for local packages lists.
 
+*{Local binary packages lists}*
+
+In case you want to include some required .deb packages to live media's
+pool/ (without installing them onto the live image) you may need to use
+lists using binary local package lists stored in
+#{config/binary_local-packageslists}#. Such media can be used as a
+customized debian install image for offline installations.
+
+Package lists that exist in this directory need to have a .list suffix in
+order to be processed.
+
 *{Extending a provided package list using includes}*
 
 % FIXME
@@ -248,7 +259,7 @@ _* #{chroot_local-packages}#
 _* Using a custom APT repository
 
 The #{chroot_local-packages}# is simpler to achieve and useful for "one-off"
-customisations but has a number of drawbacks, whilst using a custom APT
+customizations but has a number of drawbacks, whilst using a custom APT
 repository is more time-consuming to set up.
 
 3~ Using #{chroot_local-packages}# to install custom packages
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index d330950..9869ff4 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -84,7 +84,9 @@ and uninstall it with:
 
 code{
 
-# make uninstall }code
+# make uninstall
+
+}code
 
 3~ From 'snapshots'
 
@@ -94,14 +96,12 @@ are available on http://live.debian.net/debian/.
 
 2~ live-boot
 
-*{Note:}* You do not need to install live-boot on your system to create customised Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
 
-3~ Using a customised live-boot
+3~ Using a customized live-boot
 
 To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in terms.
-
-% FIXME: <xref linkend="terms"/>
+familiar with the terms mentioned in {Terms}#terms .
 
 _* Checkout the live-boot source
 
@@ -120,8 +120,8 @@ should name it without dashes '-', e.g: call it "99new_feature" and not
 _* Build a live-boot .deb
 
 You must build either on your target distribution or in a chroot containing
-your target platform: this means if your target is squeeze then you should
-build against squeeze. You can use a personal builder such as /{pbuilder}/
+your target platform: this means if your target is Squeeze then you should
+build against Squeeze. You can use a personal builder such as /{pbuilder}/
 or /{sbuild}/ to automate building packages in chroot. To build directly on
 the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/
 package):
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
new file mode 100644
index 0000000..3047ef0
--- /dev/null
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -0,0 +1,83 @@
+:B~ Managing a configuration
+
+1~ Managing a configuration
+
+This chapter explains how to manage a live configuration from initial
+creation, through successive revisions and successive releases of both the
+live-build software and the live image itself.
+
+2~ Use auto to manage configuration changes
+
+Live configurations rarely are perfect on the first try. You'll likely need
+to make a series of revisions until you are satisfied. However,
+inconsistencies can creep into your configuration from one revision to the
+next if you aren't careful. The main problem is, once a variable is given a
+default value, that value will not be recomputed from other variables that
+may change in later revisions.
+
+For example, when the distribution is first set, many 'dependent' variables
+are given default values that suit that distribution. However, if you later
+decide to change the distribution, those dependent variables continue to
+retain old values that are no longer appropriate.
+
+A second, related problem is that if you run #{lb config}# and then upgrade
+to a new version of live-build that has changed one of the variable names,
+you will discover this only by manual review of the variables in your config
+files, which you will then need to use to set the appropriate option again.
+
+All of this would be a terrible nuisance if it weren't for auto/* scripts,
+simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
+that are designed to help you manage your configuration. Simply create an
+auto/config script containing #{lb config}# command with all desired
+options, and an auto/clean that removes the files containing configuration
+variable values, and each time you #{lb config}# and #{lb clean}#, these
+files will be executed. This will ensure that your configuration is kept
+internally consistent from one revision to the next and from one live-build
+release to the next (though you will still have to take care and read the
+documentation when you upgrade live-build and make adjustments as needed).
+
+2~ Example auto scripts
+
+Use the following auto script examples as the starting point for your new
+live-build configuration. Take note that when you call the #{lb}# command
+that the auto script wraps, you must specify #{noauto}# as its parameter to
+ensure that the auto script isn't called again, recursively.
+
+auto/config
+
+code{
+
+#!/bin/sh
+lb config noauto \
+	--architecture i386 \
+	${@}
+
+}code
+
+auto/clean
+
+code{
+
+#!/bin/sh
+lb clean noauto ${@}
+rm -f config/binary config/bootstrap \
+	config/chroot config/common config/source
+rm -f binary.log
+
+}code
+
+auto/build
+
+code{
+
+#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log
+
+}code
+
+Edit auto/config, changing or adding any options as you see fit. In the
+example above, --architecture is set to i386 so that when the image is built
+on an amd64 system, it will not default to building amd64 images. Change
+this to an appropriate value for your image (or delete it if you want to use
+the default) and add any additional options in continuation lines that
+follow.
+
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index 49fdf79..9c7e8ff 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -2,10 +2,10 @@
 
 1~ Overview of tools
 
-This chapter contains an overview of the two main tools used in building
-Debian Live systems.
+This chapter contains an overview of the three main tools used in building
+Debian Live systems: live-build, live-boot and live-config.
 
-2~ live-build
+2~live-build live-build
 
 live-build is a collection of scripts to build Debian Live systems. These
 scripts are also referred to as "commands".
@@ -30,9 +30,7 @@ each command.
 Unlike debhelper, live-build contains a tool to generate a skeleton
 configuration directory, #{lb config}#. This could be considered to be
 similar to tools such as #{dh-make}#. For more information about #{lb
-config}#, please see lb-config.
-
-% FIXME: <xref linkend="lb-config"/>
+config}#, please see {The lb config command}#lb-config.
 
 Besides the common config/common, which is used by all live-build commands,
 some additional files can be used to configure the behavior of specific
@@ -65,35 +63,24 @@ dpkg --print-architecture and "dist" is the same as the codename of the
 target distribution), then they will be used in preference to the other,
 more general files.
 
-Please see installation for information on how to install live-build.
-
-% FIXME: <xref linkend="installation"/>
-
 The remainder of this section discusses the three most important commands:
 
-_* *{lb config}*: Responsible for initialising a Live system configuration
-directory. See lb-config for more information.
-
-% FIXME: <xref linkend="lb-config"/>
-
-_* *{lb build}*: Responsible for starting a Live system build. See lb-build
-for more information.
+_* *{lb config}*: Responsible for initializing a Live system configuration
+directory. See {The lb config command}#lb-config for more information.
 
-% FIXME: <xref linkend="lb-build"/>
+_* *{lb build}*: Responsible for starting a Live system build. See {The lb
+build command}#lb-build for more information.
 
 _* *{lb clean}*: Responsible for removing parts of a Live system build. See
-lb-clean for more information.
+{The lb clean command}#lb-clean for more information.
 
-% FIXME: <xref linkend="lb-clean"/
+3~lb-config The #{lb config}# command
 
-3~ The #{lb config}# command
-
-As discussed in live-build, the scripts that make up live-build source their
-configuration from a single directory named config/. As constructing this
-directory by hand would be time-consuming and error-prone, the #{lb config}#
-command can be used to create skeleton configuration folders.
-
-% FIXME: <xref linkend="live-build"/>
+As discussed in {live-build}#live-build, the scripts that make up live-build
+source their configuration from a single directory named config/. As
+constructing this directory by hand would be time-consuming and error-prone,
+the #{lb config}# command can be used to create skeleton configuration
+folders.
 
 Issuing #{lb config}# without any arguments creates a config subdirectory
 which it populates with some default settings:
@@ -156,18 +143,18 @@ $ lb config --binary-images net --hostname live-machine --username live-user
 A full list of options is available in the #{lb_config}# man page. Most
 options have a parallel with an "LB_" prefixed variable.
 
-3~ The #{lb build}# command
+3~lb-build The #{lb build}# command
 
 The #{lb build}# command reads in your configuration from the config/
 directory. It then runs the lower lower level commands needed to build your
 Live system.
 
-3~ The #{lb clean}# command
+3~lb-clean The #{lb clean}# command
 
 It is the job of the #{lb clean}# command to remove various parts of a build
 so subsequent builds can start from a clean state.
 
-2~ The live-boot package
+2~live-boot The live-boot package
 
 live-boot is a collection of scripts providing hooks for the
 initramfs-tools, used to generate an initramfs capable of booting live
@@ -182,3 +169,11 @@ Debian like systems to boot from.
 More information on initial ramfs in Debian can be found in the Debian Linux
 Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter
 on initramfs.
+
+2~live-config The live-config package
+
+live-config consists of the scripts that run at boot time after live-boot to
+configure the live system automatically. It handles such tasks as setting
+the hostname, locales and timezone, creating the live user, inhibiting cron
+jobs and performing autologin of the live user.
+
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index ae26112..3e06d2e 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -6,13 +6,13 @@ The main goal of this manual is to serve as a single access point to all documen
 
 Some of the commands mentioned in the text must be executed with superuser privileges which can be obtained by becoming the root user via #{su}# or by using #{sudo}#. To distinguish between commands which may be executed by an unprivileged user and those requiring superuser privileges, commands are prepended by #{$}# or #{#}# respectively. This symbol is not a part of the command.
 
-2~ Terms
+2~terms Terms
 
-_* *{Live system}*: An operating system that can boot without installation to a hard drive. Live systems do not alter local operating system(s) or file(s) already installed on the computer hard drive unless instructed to do so. Live systems are typically booted from media such as CDs/DVDs or USB sticks, some may also boot over the network.
+_* *{Live system}*: An operating system that can boot without installation to a hard drive. Live systems do not alter local operating system(s) or file(s) already installed on the computer hard drive unless instructed to do so. Live systems are typically booted from media such as CDs, DVDs or USB sticks. Some may also boot over the network.
 
 _* *{Debian Live}*: The Debian sub-project which maintains the live-boot, live-build, live-config, and live-manual packages.
 
-_* *{Debian Live system}*: A live system that uses software from the Debian operating system that may be booted from CDs, DVDs, USB sticks, over the network (via netboot images), and over the internet (via boot parameter #{fetch=URL}#).
+_* *{Debian Live system}*: A live system that uses software from the Debian operating system that may be booted from CDs, DVDs, USB sticks, over the network (via netboot images), and over the Internet (via boot parameter #{fetch=URL}#).
 
 _* *{Host system}*: The environment used to create the live system.
 
@@ -20,25 +20,25 @@ _* *{Target system}*: The environment used to run the live system.
 
 _* *{live-boot}*: A collection of scripts used to boot live systems. live-boot was formerly a part of live-initramfs.
 
-_* *{live-build}*: A collection of scripts used to build customised Debian Live systems. live-build was formerly know as live-helper, and even earlier know as live-package.
+_* *{live-build}*: A collection of scripts used to build customized Debian Live systems. live-build was formerly known as live-helper, and even earlier known as live-package.
 
-_* *{live-config}*: A collection of scripts used to configure a live systems during the boot process. live-config was formerly a part of live-initramfs.
+_* *{live-config}*: A collection of scripts used to configure a live system during the boot process. live-config was formerly a part of live-initramfs.
 
 _* *{live-manual}*: This document is maintained in a package called live-manual.
 
-_* *{Debian Installer/(d-i)}*: The official installation system for the Debian distribution.
+_* *{Debian Installer (d-i)}*: The official installation system for the Debian distribution.
 
 _* *{Boot parameters}*: Parameters that can be entered at the bootloader prompt to influence the kernel or live-config.
 
 _* *{chroot}*: The chroot program, chroot(8), enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting.
 
-_* *{Binary image}*: On a live system, binary image refers to the binary filesystem and the respective extension, such as binary.iso or binary.img.
+_* *{Binary image}*: A file containing the live system, such as binary.iso or binary.img.
 
-_* *{Target distribution}*: The distribution upon which your live system will be based. This can differ from the distribution of your Build System.
+_* *{Target distribution}*: The distribution upon which your live system will be based. This can differ from the distribution of your host system.
 
-_* *{squeeze/wheezy/sid stable/testing/unstable}*: The stable distribution contains the latest officially released distribution of Debian. The testing distribution is the staging area for the next stable release. A major advantage of using this distribution is that it has more recent versions of software relative to the stable release. The unstable distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution contains the latest officially released distribution of Debian. The testing distribution is the staging area for the next stable release. A major advantage of using this distribution is that it has more recent versions of software relative to the stable release. The unstable distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.
 
-At the time of writing, squeeze is the current stable release and wheezy is the current testing release. sid will always be a synonym for the unstable release.
+At the time of writing, Squeeze is the current stable release and Wheezy is the current testing release. Sid will always be a synonym for the unstable release.
 
 2~ Authors
 
@@ -70,11 +70,9 @@ _* Trent W. Buck
 
 2~ Contributing to this document
 
-This manual is intended as a community project and all proposals for improvements and contributions are extremely welcome. The preferred way to submit a contribution is to send it to the mailing list. Please see contact for more information.
+This manual is intended as a community project and all proposals for improvements and contributions are extremely welcome. The preferred way to submit a contribution is to send it to the mailing list. Please see {Contact}#contact for more information.
 
-% FIXME: <xref linkend="contact"/>
-
-When submitting a contribution please clearly identify its copyright holder and include the licensing statement. Note that to be accepted the contribution must be licensed under the same license as the rest of the document, namely GPL version 3 or later.
+When submitting a contribution, please clearly identify its copyright holder and include the licensing statement. Note that to be accepted, the contribution must be licensed under the same license as the rest of the document, namely, GPL version 3 or later.
 
 The sources for this manual are maintained using the Git version control system. You can checkout the latest copy by executing:
 
@@ -88,7 +86,7 @@ Prior to submission of your contribution, please preview your work. To preview t
 
 code{
 
-# apt-get install sisu-complete
+# apt-get install make po4a sisu-complete
 
 }code
 
@@ -102,15 +100,17 @@ $ make build
 
 3~ Applying patches
 
-Directly commiting to the repository is possible by anyone. However, we ask you to send bigger changes to the mailinglist to discuss them first. In order to push to the repository, the following steps are required.
+Directly commiting to the repository is possible by anyone. However, we ask you to send bigger changes to the mailing list to discuss them first. In order to push to the repository, the following steps are required.
 
 _* Fetch the public commit key:
 
 code{
 
 $ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live
-$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub
+$ wget http://live.debian.net/other/keys/live-manual@debian-live \
+	-O ~/.ssh/identity.d/live-manual at debian-live
+$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \
+	-O ~/.ssh/identity.d/live-manual at debian-live.pub
 $ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*
 
 }code
@@ -136,7 +136,7 @@ $ git clone gitosis at live.debian.net:/live-manual.git
 
 }code
 
-_* After editing the files in manual/en/, please call the 'commit' target in the toplevel directory to sanitize the files and update the translation files:
+_* After editing the files in manual/en/, please call the 'commit' target in the top level directory to sanitize the files and update the translation files:
 
 code{
 
diff --git a/manual/en/about_project.ssi b/manual/en/about_project.ssi
index c7215fd..fc4a752 100644
--- a/manual/en/about_project.ssi
+++ b/manual/en/about_project.ssi
@@ -56,20 +56,16 @@ In this phase we will not ship or install sample or alternative configurations.
 
 Whenever we need a different default configuration, we will do that in coordination with its package maintainer in Debian.
 
-A system for configuring packages is provided using debconf in #{lh config}# (use --preseed FILE) allowing custom configured packages to be installed in your custom produced Debian Live images, but for official live images only default configuration will be used. For more information, please see customization.
-
-% FIXME: <xref linkend="customization"/>
+A system for configuring packages is provided using debconf in #{lb config}# (use --preseed FILE) allowing custom configured packages to be installed in your custom produced Debian Live images, but for official live images only default configuration will be used. For more information, please see {Customization overview}#customization-overview.
 
 Exception: There are a few essential changes needed to bring a live system to life (e.g. configuring pam to allow empty passwords). These essential changes have to be kept as minimal as possible and should be merged within the Debian repository if possible.
 
-2~ Contact
+2~contact Contact
 
 _* *{Mailing list}*: The primary contact for the project is the mailing list at http://lists.debian.org/debian-live/. You can email the list directly by addressing your mail to debian-live at lists.debian.org. The list archives are available at http://lists.debian.org/debian-live/.
 
 _* *{IRC}*: A number of users and developers are present in the #debian-live channel on irc.debian.org (OFTC). When asking a question on IRC, please be patient for an answer. If no answer is forthcoming, please email the mailing list.
 
-_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs reported by users and developers. Each bug is given a number, and is kept on file until it is marked as having been dealt with. For more information, please see bugs.
-
-% FIXME: <xref linkend="bugs"/>
+_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs reported by users and developers. Each bug is given a number, and is kept on file until it is marked as having been dealt with. For more information, please see {Reporting bugs}#bugs.
 
 _* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a place to gather information, discuss applied technologies, and document frameworks of Debian Live systems that go beyond the scope of this document.
diff --git a/manual/en/index.html.in b/manual/en/index.html.in
index 27530f4..9f0b3a7 100644
--- a/manual/en/index.html.in
+++ b/manual/en/index.html.in
@@ -2,6 +2,7 @@
 
 <head>
 	<title>Debian Live Project</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 </head>
 
 <body>
@@ -12,7 +13,7 @@
 	</p>
 
 	<p>
-		Please report errors, omissions, patches and suggestions to our mailinglist at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a> and read about <a href="html/meta.html#contributing">how to contribute</a> to the manual.
+		Please report errors, omissions, patches and suggestions to our mailinglist at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a> and read about <a href="html/1.html#37">how to contribute</a> to the manual.
 	</p>
 
 	<h3>Available Formats</h3>
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index eaca0b5..d66ac19 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,12 +9,12 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-10-03
+ :published: 2010-10-25
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
 @make:
- :bold: /lenny|stable|squeeze|testing|sid|unstable/
+ :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
  :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
  :num_top: 1
  :skin: skin_debian-live
@@ -35,46 +35,56 @@
 
 << user_overview.ssi
 
+<< user_managing_a_configuration.ssi
+
+<< user_customization-overview.ssi
+
 << user_customization-packages.ssi
 
 << user_customization-contents.ssi
 
+<< user_customization-internationalization.ssi
+
 :B~ Development ~#
 
 :B~ Project ~#
 
-:B~ Other ~#
+<< project_bugs.ssi
 
-<< other_customization-internationalization.ssi
+:B~ Other ~#
 
-<< other_customization-bootup.ssi
+Other material that formerly appeared in this section is out of date and/or has
+not been approved for release. It has therefore been omitted, but can still be
+found in the document source; see 'About this manual'. Any part of the omitted
+material that is still useful will be included in the release only after it has
+been reviewed.
 
-<< other_customization-binary.ssi
+% << other_customization-bootup.ssi
 
-<< other_customization-backports.ssi
+% << other_customization-binary.ssi
 
-<< other_common-tasks.ssi
+% << other_customization-backports.ssi
 
-<< other_live-environment.ssi
+% << other_common-tasks.ssi
 
-<< other_faq.ssi
+% << other_live-environment.ssi
 
-<< other_reporting-bugs.ssi
+% << other_faq.ssi
 
-<< other_howtos.ssi
+% << other_howtos.ssi
 
-<< other_coding-style.ssi
+% << other_coding-style.ssi
 
-<< other_procedures.ssi
+% << other_procedures.ssi
 
-<< other_resources.ssi
+% << other_resources.ssi
 
-<< other_use-cases.ssi
+% << other_use-cases.ssi
 
-<< other_success-stories.ssi
+% << other_success-stories.ssi
 
-<< other_troubleshooting.ssi
+% << other_troubleshooting.ssi
 
-<< other_configuration-layout.ssi
+% << other_configuration-layout.ssi
 
-<< other_configuration-files.ssi
+% << other_configuration-files.ssi
diff --git a/manual/en/other_common-tasks.ssi b/manual/en/other_common-tasks.ssi
index 22a6323..106ec26 100644
--- a/manual/en/other_common-tasks.ssi
+++ b/manual/en/other_common-tasks.ssi
@@ -14,7 +14,7 @@ _* *{"Normal" Debian Installer}*: This is a normal Debian Live image with a sepe
 
 This means that Debian is installed by fetching and installing <command>.deb</command> packages using #{debootstrap}# or #{cdebootstrap}#, from the local media or some network-base network, resulting in a standard Debian system being installed to the hard disk.
 
-This whole process can be preseeded and customised in a number of ways; see the relevant "DebianInstaller" wiki page and installation guide for more. This is operational now withing live-helper.
+This whole process can be preseeded and customized in a number of ways; see the relevant "DebianInstaller" wiki page and installation guide for more. This is operational now withing live-helper.
 
 _* *{"Live" Debian Installer}*: This is a Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into an instance of the Debian Installer.
 
diff --git a/manual/en/other_customization-binary.ssi b/manual/en/other_customization-binary.ssi
index 43e3ccc..9e951ba 100644
--- a/manual/en/other_customization-binary.ssi
+++ b/manual/en/other_customization-binary.ssi
@@ -1,6 +1,6 @@
-B~ Customising the binary image
+B~ Customizing the binary image
 
-1~ Customising the binary image<
+1~ Customizing the binary image<
 
 2~ ISO metadata
 
diff --git a/manual/en/other_customization-bootup.ssi b/manual/en/other_customization-bootup.ssi
index 91b2859..cfae687 100644
--- a/manual/en/other_customization-bootup.ssi
+++ b/manual/en/other_customization-bootup.ssi
@@ -1,8 +1,8 @@
-B~ Customising the bootup process
+B~ Customizing the bootup process
 
-1~ Customising the bootup process
+1~ Customizing the bootup process
 
-This chapter discusses customisation of bootup process of a live system, including kernel options, modifications to the bootloader, "splash" screens and startup scripts.
+This chapter discusses customization of bootup process of a live system, including kernel options, modifications to the bootloader, "splash" screens and startup scripts.
 
 FIXME
 
diff --git a/manual/en/other_customization-internationalization.ssi b/manual/en/other_customization-internationalization.ssi
deleted file mode 100644
index fc0bbb2..0000000
--- a/manual/en/other_customization-internationalization.ssi
+++ /dev/null
@@ -1,51 +0,0 @@
-B~ Customising Locale And Language
-
-1~ Customising Locale And Language
-
-2~ Default locale and keyboard
-
-The default locale when building a live cd is "locale=en_US.UTF-8". To set the locale for the UK (locale=en_GB.UTF-8)
-
-code{
-
-$ lh_config --bootappend-live "locale=en_GB.UTF-8"
-
-}code
-
-The entry for a British keyboard would be
-
-code{
-
-$ lh_config --bootappend-live "keyb=uk"
-
-}code
-
-To configure both the locale and the keyboard for the UK the entry would be
-
-code{
-
-$ lh_config --bootappend-live "locale=en_GB.UTF-8 keyb=uk"
-
-}code
-
-or
-
-code{
-
-$ lh_config --bootappend-live "locale=uk"
-
-}code
-
-Note: You can find a list of options in the manpage for live-initramfs. Only UTF8 locales are supported by live-initramfs.
-
-2~ l10n Packages
-
-lh build can automatically check for each package, for which it's know that there are -l10n packages available and install them. To add Swedish packages the entry would be
-
-code{
-
-$ lh_config --language "se"
-
-}code
-
-This will also change the default syslinux language if #{config/templates/syslinux/se}# is available. Check syslinux configuration FIXME
diff --git a/manual/en/other_faq.ssi b/manual/en/other_faq.ssi
index a38700e..34ed2f6 100644
--- a/manual/en/other_faq.ssi
+++ b/manual/en/other_faq.ssi
@@ -158,7 +158,7 @@ Note: The hook script must be executable. Do not forget to lh_clean --chroot aft
 You must also use the example script /usr/share/live-helper/examples/hooks/update-initramfs.sh to ensure your script gets built into the initramfs (read the comment header for instructions).
 
 Q: How do I add software not in Debian ?
-A: See Customising package installation
+A: See Customizing package installation
 % FIXME: <xref linkend="packages"/>
 
 Q: What is the manifest with Ubuntu used for?
@@ -228,7 +228,7 @@ A: See 10n
 % FIXME: <xref linkend="internalization"/>
 
 Q: How do I get past boot prompt without a working keyboard?
-A: See Customising the bootup process
+A: See Customizing the bootup process
 % FIXME: <xref linkend="bootup"/>
 Note: Boot from an USB-HDD on an iMac with GRUB did not work.
 
diff --git a/manual/en/other_reporting-bugs.ssi b/manual/en/project_bugs.ssi
similarity index 54%
rename from manual/en/other_reporting-bugs.ssi
rename to manual/en/project_bugs.ssi
index 8ce8694..a5ab90c 100644
--- a/manual/en/other_reporting-bugs.ssi
+++ b/manual/en/project_bugs.ssi
@@ -1,6 +1,6 @@
 B~ Reporting bugs
 
-1~ Reporting bugs
+1~bugs Reporting bugs
 
 Debian Live is far from being perfect, but we want to make it as close as possible to perfect - with your help. Do not hesitate to report a bug: it is better to fill a report twice than never. However, this chapter includes recommendations how to file good bug reports.
 
@@ -8,19 +8,19 @@ For the impatient:
 
 _* Always check first the image status updates on our homepage at http://live.debian.net/ for known issues.
 
-_* Always try to reproduce the bug with the *{most recent version}* of live-helper and live-initramfs before submitting a bug report.
+_* Always try to reproduce the bug with the *{most recent versions}* of live-build, live-boot, and live-config before submitting a bug report.
 
-_* Try to give *{as specific information as possible}* about the bug. This includes (at least) the version of live-helper and live-initramfs used and the distribution of the live system you are building.
+_* Try to give *{as specific information as possible}* about the bug. This includes (at least) the version of live-build, live-boot, and live-config used and the distribution of the live system you are building.
 
 2~ Known issues
 
-Due to the nature of Debian testing and Debian unstable branches being a moving target, building a live system may not always be possible.
+Due to the nature of Debian testing and Debian unstable distributions being a moving target, building a live system may not always be possible.
 
-If this is a problem, do not build a system based on testing or unstable, but go with stable. live-helper does always default to the current stable release.
+If this is a problem, do not build a system based on testing or unstable, but go with stable. live-build does always default to the current stable release.
 
 Currently known issues are listed under the section 'status' on our homepage at http://live.debian.net/
 
-It is out of the scope of this manual to train you in correctly identifying and fixing problems in packages of the development branches, however, there are two things you can always try: When not succeeding to build testing, try if unstable works. If unstable does not work either, revert to testing and pinning the newer version of the failing package from unstable.
+It is out of the scope of this manual to train you in correctly identifying and fixing problems in packages of the development distributions, however, there are two things you can always try: When not succeeding to build testing, try if unstable works. If unstable does not work either, revert to testing and pinning the newer version of the failing package from unstable.
 
 2~ Rebuild from scratch
 
@@ -28,19 +28,21 @@ To ensure that a particular bug is not caused by an unclean built system, please
 
 2~ Use up-to-date packages
 
-Using outdated packages can cause significant problems when trying to reproduce (and ultimately fix) your problem. If a relevant package is not available in Debian anymore, please recognize that the resources of the Debian kernel team are limited and will be unlikely to be able to fix the problem.
+Using outdated packages can cause significant problems when trying to reproduce (and ultimately fix) your problem.
 
-2~ Collect information
+2~collect-information Collect information
 
-Please provide enough information with your report. At a minimum, it should contain the exact version of live-helper version where the bug is encountered, and steps to reproduce it. Please use common sense and include other relevant information if you think that it might help in solving the problem.
+Please provide enough information with your report. At a minimum, it should contain the exact version of live-build version where the bug is encountered, and steps to reproduce it. Please use common sense and include other relevant information if you think that it might help in solving the problem.
 
 To make the most out of your bug report, we require at least the following information:
 
 _* Architecture of the host system
 
-_* Version of live-helper on the host system
+_* Version of live-build on the host system
 
-_* Version of live-initramfs on the live system
+_* Version of live-boot on the live system
+
+_* Version of live-config on the live system
 
 _* Version of debootstrap and/or cdebootstrap on the host system
 
@@ -52,15 +54,15 @@ _* Version of the kernel on the live system
 
 You can generate a log of the build process by using the tee command:
 
-% code{
-%
-% lh_build 2>&1 | tee buildlog.txt
-%
-% }code
+code{
+
+lb build 2>&1 | tee build.log
+
+}code
 
 Additionally, to rule out other errors, it is always a good idea to tar up your config directory and upload it somewhere (do *{not}* send it as an attachment to the mailinglist), so that we can try to reproduce the errors you encountered.
 
-Remember to send in any logs that were produced with English locale settings, e.g. run your live-helper commands with a leading #{LC_ALL=C}# or #{LC_ALL=en_US}#.
+Remember to send in any logs that were produced with English locale settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #{LC_ALL=en_US}#.
 
 2~ Use the correct package to report the bug against
 
@@ -68,22 +70,21 @@ Where does the bug appear?
 
 3~ At build time whilst bootstrapping
 
-live-helper first bootstraps a basic Debian system with #{debootstrap}# or #{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian distribution it is bootstrapping, it may fail. If a bug appears here, check if the error is related to a specific Debian package (most likely), or if it is related to cdebootstrap itself.
+live-build first bootstraps a basic Debian system with #{debootstrap}# or #{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian distribution it is bootstrapping, it may fail. If a bug appears here, check if the error is related to a specific Debian package (most likely), or if it is related to bootstrapping tool itself.
 
-In both cases, this is not a bug in Debian Live, but rather in Debian itself which we can not fix this directly. Please report such a bug against #{debootstrap}#, #{cdebootstrap}# or the failing package.
+In both cases, this is not a bug in Debian Live, but rather in Debian itself which we can not fix this directly. Please report such a bug against the bootstrapping tool or the failing package.
 
 3~ At build time whilst installing packages
 
-live-helper installs additional packages from the Debian archive and depending on the Debian distribution used and the daily archive state, it can fail. If a bug appears here, check if the error is also reproducible on a normal system.
+live-build installs additional packages from the Debian archive and depending on the Debian distribution used and the daily archive state, it can fail. If a bug appears here, check if the error is also reproducible on a normal system.
 
-If this is the case, this is not a bug in Debian Live, but rather in Debian - please report it against the failing package. Running debootstrap seperately from the Live system build or running lh_bootstrap with #{--debug}# will give you more information.
+If this is the case, this is not a bug in Debian Live, but rather in Debian - please report it against the failing package. Running debootstrap seperately from the Live system build or running lb bootstrap with #{--debug}# will give you more information.
 
 Also, if you are using a local mirror and/or any of sort of proxy and you are experiencing a problem, please always reproduce it first by bootstrapping from an official mirror.
 
 3~ At boot-time
 
-If your image does not boot, please report it to the mailing list together with the information requested in collect-information. Do not forget to mention, how/when the image failed, in Qemu, VMWare or real hardware. If you are using a virtualization technology of any kind, please always run it on real hardware before reporting a bug. Providing a screenshot of the failure is also very helpful.
-% FIXME: <xref linkend="collect-information"/>
+If your image does not boot, please report it to the mailing list together with the information requested in {Collect information}#collect-information. Do not forget to mention, how/when the image failed, in Qemu, VMWare or real hardware. If you are using a virtualization technology of any kind, please always run it on real hardware before reporting a bug. Providing a screenshot of the failure is also very helpful.
 
 3~ At run-time
 
@@ -95,12 +96,12 @@ Before filing the bug, please search the web for the particular error message or
 
 You should pay particular attention to the Debian Live mailing list, as well as the homepage, as these are likely to contain the most up-to-date information. If such information exists, always include the references to it in your bug report.
 
-In addition, you should check the current bug list for live-helper and the current bug list for live-initramfs at to see whether something similar has been reported already.
+In addition, you should check the current bug lists for live-build, live-boot, and live-config to see whether something similar has been reported already.
 
 2~ Where to report bugs
 
 The Debian Live project keeps track of all bugs in the Debian Bug Tracking System (BTS). For information on how to use the system, please see http://bugs.debian.org/. You can also submit the bugs by using the #{reportbug}# command from the package with the same name.
 
-In general, you should report build time errors against the live-helper package and run time errors against live-initramfs. If you are unsure of which package is appropriate or need more help before submitting a bug report, please send a message to the mailing list and we will help you to figure it out.
+In general, you should report build time errors against the live-build package, boot time errors against live-boot, and run time errors against live-config. If you are unsure of which package is appropriate or need more help before submitting a bug report, please send a message to the mailing list and we will help you to figure it out.
 
-Please note that bugs found in distributions derived from Debian (such as Ubuntu, Knoppix, Xandros, etc.) should *{not}* be reported to the Debian BTS unless they can be also reproduced on a Debian system using official Debian packages.
+Please note that bugs found in distributions derived from Debian (such as Ubuntu and others) should *{not}* be reported to the Debian BTS unless they can be also reproduced on a Debian system using official Debian packages.
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index f281d28..4590f82 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -6,9 +6,7 @@ This chapter contains a brief overview of the build process as well as containin
 
 2~ What is a live system?
 
-A live system usually means an operating system booted on a computer from a removable medium (such as CD-ROM, USB stick, or network), ready to use without any installation on the usual drive(s), with an auto-configuration done at runtime (see terms).
-
-% FIXME: <xref linkend="terms"/>
+A live system usually means an operating system booted on a computer from a removable medium (such as CD-ROM, USB stick, or network), ready to use without any installation on the usual drive(s), with an auto-configuration done at runtime (see {Terms}#terms ).
 
 With Debian Live, it's a Debian GNU/Linux operating system, built for one of the supported architectures (currently amd64, i386, powerpc and sparc). It is made from following parts:
 
@@ -18,7 +16,7 @@ _* The Linux image, usually named #{vmlinuz*}#
 
 _* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, containing modules possibly needed to mount the filesystem's image and some scripts to do it.
 
-_* *{System image}*: The operating systems filesystem image. Debian Live uses SquashFS, a compressed filesystem, to minimize its image size. Note that it's read-only. So, during boot the Debian Live system will use a RAM disk and 'union' mechanism to enable writing files within the running system. However, all modifications will be lost upon shutdown unless optional persistence partition(s) are used (see persistence).
+_* *{System image}*: The operating systems filesystem image. The SquashFS compressed filesystem is used to minimize the Debian Live image size. Note that it's read-only. So, during boot the Debian Live system will use a RAM disk and 'union' mechanism to enable writing files within the running system. However, all modifications will be lost upon shutdown unless optional persistence partition(s) are used (see persistence).
 
 % FIXME: <xref linkend="persistence"/>
 
@@ -38,9 +36,7 @@ $ lb config
 
 }code
 
-By passing no parameters to #{lb config}# we indicated that we wish to use the defaults (see lb-config).
-
-% FIXME: <xref linkend="lb-config"/>
+By passing no parameters to #{lb config}# we indicated that we wish to use the defaults (see {The lb config command}#lb-config ).
 
 Now that we have a "config/" hierarchy, we may build the image with the lb build command:
 
@@ -50,9 +46,7 @@ code{
 
 }code
 
-This process can take a while, depending on the speed of your network connection (see lb-build).
-
-% FIXME: <xref linkend="lb-build"/>
+This process can take a while, depending on the speed of your network connection (see {The lb build command}#lb-build ).
 
 3~ Testing an ISO image with Qemu
 
@@ -80,6 +74,16 @@ and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to build
 
 After successful installation, virtualbox can be e.g. found in the GNOME menu under 'Applications/System Tools/VirtualBox OSE'.
 
+Please consider including of following packages onto the live image to achieve higher resolution of the display when booting the live image in virutalbox-ose (1280x1024 instead of 800x600 and in particular if the default resolution of the virtualbox-ose display shouldn't work with the gui-installer).
+
+code{
+
+virtualbox-ose-guest-dkms
+virtualbox-ose-guest-utils
+virtualbox-ose-guest-x11
+
+}code
+
 3~ Burning an ISO image to a physical medium
 
 Burning an ISO image is easy:
@@ -96,9 +100,7 @@ $ wodim binary.iso
 
 The following sequence of commands will create a basic USB/HDD image containing just the Debian standard system without X.org. It is suitable for booting from USB sticks, USB hard drives, and various other portable storage devices.
 
-Note if you created an iso image with the previous example, you will need to clean up your working directory with the #{lb clean} command (see lb-clean):
-
-% FIXME: <xref linkend="lb-clean"/>
+Note if you created an iso image with the previous example, you will need to clean up your working directory with the #{lb clean} command (see {The lb clean command}#lb-clean ):
 
 code{
 
@@ -255,7 +257,7 @@ code{
 
 dpkg-reconfigure -plow tftpd-hpa
 
-code}
+}code
 
 and fill in the new tftp server directory when being asked about it.
 
diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index 60c9f7b..7d706fe 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -1,8 +1,8 @@
-B~ Customising contents
+B~ Customizing contents
 
-1~ Customising contents
+1~customizing-contents Customizing contents
 
-This chapter discusses further customisation of the live system.
+This chapter discusses further customization of the live system.
 
 2~ Includes
 
diff --git a/manual/en/user_customization-internationalization.ssi b/manual/en/user_customization-internationalization.ssi
new file mode 100644
index 0000000..65bd2b1
--- /dev/null
+++ b/manual/en/user_customization-internationalization.ssi
@@ -0,0 +1,43 @@
+B~ Customizing locale and language
+
+1~customizing-locale-and-language Customizing locale and language
+
+2~ Default locale and keyboard
+
+The default locale when building a live cd is "locales=en_US.UTF-8", to set the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
+
+code{
+
+$ lb config --bootappend-live "locales=de_CH.UTF-8"
+
+}code
+
+The entry for a Swiss-German keyboard would be:
+
+code{
+
+$ lb config --bootappend-live "keyboard-layouts=ch"
+
+}code
+
+Combined, the keyboard and locale configured for Switzerland would be:
+
+code{
+
+$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
+
+}code
+
+Note: You can find a list of options in the manpage for live-config. Currently, only UTF-8 locales are supported.
+
+2~ l10n Packages
+
+An experimental feature of live-build is to automatically check for each package for which it is know that there are -l10n packages available and install them. To add German packages the entry would be
+
+code{
+
+$ lb config --language "de"
+
+}code
+
+This will also change the default syslinux language if translations are available or local translations have been put into #{config/templates/syslinux/de}#.
diff --git a/manual/en/user_customization-overview.ssi b/manual/en/user_customization-overview.ssi
new file mode 100644
index 0000000..b4df19c
--- /dev/null
+++ b/manual/en/user_customization-overview.ssi
@@ -0,0 +1,9 @@
+B~ Customizing contents
+
+1~customization-overview Customization overview
+
+% FIXME: just a stub for now.  In conversational style, cover the different kinds of customization
+% and link to each section within the text.
+
+This chapter gives an overview of the various ways in which your Debian live systems may be customized. See sections {Customizing package installation}#customizing-package-installation, {Customizing contents}#customizing-contents and {Customizing locale and language}#customizing-locale-and-language.
+
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index a94ac0f..289d6ab 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -1,6 +1,6 @@
-:B~ Customising package installation
+:B~ Customizing package installation
 
-1~ Customising package installation
+1~customizing-package-installation Customizing package installation
 
 _* Selecting additional packages to be installed
 
@@ -141,6 +141,12 @@ You may supplement the supplied lists using local package lists stored in #{conf
 
 Package lists that exist in this directory need to have a #{.list}# suffix in order to be processed. Local packages lists always override package lists distributed with live-build. This can cause undesired effects, we therefore recommend to use unique names for local packages lists.
 
+*{Local binary packages lists}*
+
+In case you want to include some required .deb packages to live media's pool/ (without installing them onto the live image) you may need to use lists using binary local package lists stored in #{config/binary_local-packageslists}#. Such media can be used as a customized debian install image for offline installations.
+
+Package lists that exist in this directory need to have a .list suffix in order to be processed.
+
 *{Extending a provided package list using includes}*
 
 % FIXME
@@ -214,7 +220,7 @@ _* #{chroot_local-packages}#
 
 _* Using a custom APT repository
 
-The #{chroot_local-packages}# is simpler to achieve and useful for "one-off" customisations but has a number of drawbacks, whilst using a custom APT repository is more time-consuming to set up.
+The #{chroot_local-packages}# is simpler to achieve and useful for "one-off" customizations but has a number of drawbacks, whilst using a custom APT repository is more time-consuming to set up.
 
 3~ Using #{chroot_local-packages}# to install custom packages
 
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index 58ad880..7e246b7 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -83,6 +83,7 @@ and uninstall it with:
 code{
 
 # make uninstall
+
 }code
 
 3~ From 'snapshots'
@@ -91,13 +92,11 @@ If you do not wish to build or install live-build from source, you can use snaps
 
 2~ live-boot
 
-*{Note:}* You do not need to install live-boot on your system to create customised Debian Live systems. However, doing so will do no harm.
-
-3~ Using a customised live-boot
+*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
 
-To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in terms.
+3~ Using a customized live-boot
 
-% FIXME: <xref linkend="terms"/>
+To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in {Terms}#terms .
 
 _* Checkout the live-boot source
 
@@ -113,7 +112,7 @@ And beware that if you want to add your pre-init script in live-bottom, you shou
 
 _* Build a live-boot .deb
 
-You must build either on your target distribution or in a chroot containing your target platform: this means if your target is squeeze then you should build against squeeze. You can use a personal builder such as /{pbuilder}/ or /{sbuild}/ to automate building packages in chroot. To build directly on the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
+You must build either on your target distribution or in a chroot containing your target platform: this means if your target is Squeeze then you should build against Squeeze. You can use a personal builder such as /{pbuilder}/ or /{sbuild}/ to automate building packages in chroot. To build directly on the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
 
 code{
 
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
new file mode 100644
index 0000000..81c5eea
--- /dev/null
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -0,0 +1,54 @@
+:B~ Managing a configuration
+
+1~ Managing a configuration
+
+This chapter explains how to manage a live configuration from initial creation, through successive revisions and successive releases of both the live-build software and the live image itself.
+
+2~ Use auto to manage configuration changes
+
+Live configurations rarely are perfect on the first try. You'll likely need to make a series of revisions until you are satisfied. However, inconsistencies can creep into your configuration from one revision to the next if you aren't careful. The main problem is, once a variable is given a default value, that value will not be recomputed from other variables that may change in later revisions.
+
+For example, when the distribution is first set, many 'dependent' variables are given default values that suit that distribution. However, if you later decide to change the distribution, those dependent variables continue to retain old values that are no longer appropriate.
+
+A second, related problem is that if you run #{lb config}# and then upgrade to a new version of live-build that has changed one of the variable names, you will discover this only by manual review of the variables in your config files, which you will then need to use to set the appropriate option again.
+
+All of this would be a terrible nuisance if it weren't for auto/* scripts, simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands that are designed to help you manage your configuration. Simply create an auto/config script containing #{lb config}# command with all desired options, and an auto/clean that removes the files containing configuration variable values, and each time you #{lb config}# and #{lb clean}#, these files will be executed. This will ensure that your configuration is kept internally consistent from one revision to the next and from one live-build release to the next (though you will still have to take care and read the documentation when you upgrade live-build and make adjustments as needed).
+
+2~ Example auto scripts
+
+Use the following auto script examples as the starting point for your new live-build configuration. Take note that when you call the #{lb}# command that the auto script wraps, you must specify #{noauto}# as its parameter to ensure that the auto script isn't called again, recursively.
+
+auto/config
+
+code{
+
+#!/bin/sh
+lb config noauto \
+	--architecture i386 \
+	${@}
+
+}code
+
+auto/clean
+
+code{
+
+#!/bin/sh
+lb clean noauto ${@}
+rm -f config/binary config/bootstrap \
+	config/chroot config/common config/source
+rm -f binary.log
+
+}code
+
+auto/build
+
+code{
+
+#!/bin/sh
+lb build noauto ${@} 2>&1 | tee binary.log
+
+}code
+
+Edit auto/config, changing or adding any options as you see fit. In the example above, --architecture is set to i386 so that when the image is built on an amd64 system, it will not default to building amd64 images. Change this to an appropriate value for your image (or delete it if you want to use the default) and add any additional options in continuation lines that follow.
+
diff --git a/manual/en/user_overview.ssi b/manual/en/user_overview.ssi
index 4425783..341da61 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -2,9 +2,9 @@
 
 1~ Overview of tools
 
-This chapter contains an overview of the two main tools used in building Debian Live systems.
+This chapter contains an overview of the three main tools used in building Debian Live systems: live-build, live-boot and live-config.
 
-2~ live-build
+2~live-build live-build
 
 live-build is a collection of scripts to build Debian Live systems. These scripts are also referred to as "commands".
 
@@ -16,9 +16,7 @@ _* The scripts have a central location for configuring their operation. In debhe
 
 _* The scripts are independent - that is to say, it is always safe to run each command.
 
-Unlike debhelper, live-build contains a tool to generate a skeleton configuration directory, #{lb config}#. This could be considered to be similar to tools such as #{dh-make}#. For more information about #{lb config}#, please see lb-config.
-
-% FIXME: <xref linkend="lb-config"/>
+Unlike debhelper, live-build contains a tool to generate a skeleton configuration directory, #{lb config}#. This could be considered to be similar to tools such as #{dh-make}#. For more information about #{lb config}#, please see {The lb config command}#lb-config.
 
 Besides the common config/common, which is used by all live-build commands, some additional files can be used to configure the behavior of specific helper commands. These files are typically named config/command or config/stage (where "stage", of course, is replaced with the name of the stage that they belong to, and "command" with the name of the command).
 
@@ -30,29 +28,17 @@ All config files are shell scripts which are sourced by a live-build command. Th
 
 In some rare cases you may want to have different versions of these files for different architectures or distributions. If files named config/stage.arch or config/stage_command.arch, and config/stage.dist or config/stage_command.dist exist (where "arch" is the same as the output of dpkg --print-architecture and "dist" is the same as the codename of the target distribution), then they will be used in preference to the other, more general files.
 
-Please see installation for information on how to install live-build.
-
-% FIXME: <xref linkend="installation"/>
-
 The remainder of this section discusses the three most important commands:
 
-_* *{lb config}*: Responsible for initialising a Live system configuration directory. See lb-config for more information.
-
-% FIXME: <xref linkend="lb-config"/>
-
-_* *{lb build}*: Responsible for starting a Live system build. See lb-build for more information.
+_* *{lb config}*: Responsible for initializing a Live system configuration directory. See {The lb config command}#lb-config for more information.
 
-% FIXME: <xref linkend="lb-build"/>
+_* *{lb build}*: Responsible for starting a Live system build. See {The lb build command}#lb-build for more information.
 
-_* *{lb clean}*: Responsible for removing parts of a Live system build. See lb-clean for more information.
+_* *{lb clean}*: Responsible for removing parts of a Live system build. See {The lb clean command}#lb-clean for more information.
 
-% FIXME: <xref linkend="lb-clean"/
+3~lb-config The #{lb config}# command
 
-3~ The #{lb config}# command
-
-As discussed in live-build, the scripts that make up live-build source their configuration from a single directory named config/. As constructing this directory by hand would be time-consuming and error-prone, the #{lb config}# command can be used to create skeleton configuration folders.
-
-% FIXME: <xref linkend="live-build"/>
+As discussed in {live-build}#live-build, the scripts that make up live-build source their configuration from a single directory named config/. As constructing this directory by hand would be time-consuming and error-prone, the #{lb config}# command can be used to create skeleton configuration folders.
 
 Issuing #{lb config}# without any arguments creates a config subdirectory which it populates with some default settings:
 
@@ -116,18 +102,23 @@ $ lb config --binary-images net --hostname live-machine --username live-user ...
 
 A full list of options is available in the #{lb_config}# man page. Most options have a parallel with an "LB_" prefixed variable.
 
-3~ The #{lb build}# command
+3~lb-build The #{lb build}# command
 
 The #{lb build}# command reads in your configuration from the config/ directory. It then runs the lower lower level commands needed to build your Live system.
 
-3~ The #{lb clean}# command
+3~lb-clean The #{lb clean}# command
 
 It is the job of the #{lb clean}# command to remove various parts of a build so subsequent builds can start from a clean state.
 
-2~ The live-boot package
+2~live-boot The live-boot package
 
 live-boot is a collection of scripts providing hooks for the initramfs-tools, used to generate an initramfs capable of booting live systems, such as those created by live-build. This includes the Debian Live isos, netboot tarballs, and usb stick images.
 
 At boot time it will look for read-only media containing a "/live" directory where a root filesystem (often a compressed filesystem image like squashfs) is stored. If found, it will create a writable environment, using aufs, for Debian like systems to boot from.
 
 More information on initial ramfs in Debian can be found in the Debian Linux Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter on initramfs.
+
+2~live-config The live-config package
+
+live-config consists of the scripts that run at boot time after live-boot to configure the live system automatically. It handles such tasks as setting the hostname, locales and timezone, creating the live user, inhibiting cron jobs and performing autologin of the live user.
+
diff --git a/manual/de/_sisu/.empty b/manual/fr/_sisu/.empty
similarity index 100%
copy from manual/de/_sisu/.empty
copy to manual/fr/_sisu/.empty
diff --git a/manual/de/_sisu/.empty b/manual/fr/_sisu/image/.empty
similarity index 100%
copy from manual/de/_sisu/.empty
copy to manual/fr/_sisu/image/.empty
diff --git a/manual/de/_sisu/sisurc.yml b/manual/fr/_sisu/sisurc.yml
similarity index 100%
copy from manual/de/_sisu/sisurc.yml
copy to manual/fr/_sisu/sisurc.yml
diff --git a/manual/de/_sisu/skin/doc/skin_debian-live.rb b/manual/fr/_sisu/skin/doc/skin_debian-live.rb
similarity index 100%
copy from manual/de/_sisu/skin/doc/skin_debian-live.rb
copy to manual/fr/_sisu/skin/doc/skin_debian-live.rb
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
new file mode 100644
index 0000000..eb719e4
--- /dev/null
+++ b/manual/fr/about_manual.ssi
@@ -0,0 +1,218 @@
+:B~ À propos de ce manuel
+
+1~ À propos de ce manuel
+
+Le but principal de ce manuel est de servir de point d'accès centralisé pour
+toute la documentation liée au projet Debian Live. Il ne contient pas de
+documentation utilisateur pour utiliser un système Debian Live tant que
+celle-ci n'est pas spécifique au projet Live.
+
+Certaines commandes mentionnées dans le texte doivent être exécutées avec
+les privilèges super-utilisateur, qui peuvent être obtenu en devenant root à
+l'aide de #{su}# ou en utilisant #{sudo}#. Afin de distinguer les commandes
+qui peuvent être exécutées par un utilisateur sans privilèges de celles
+nécessitant les privilèges super-utilisateur, les commandes sont précédées
+respectivement par #{$}# ou #{#}#. Ce symbole ne fait pas partie de la
+commande.
+
+2~terms Terminologie
+
+_* *{Système Live}*: Un système d'exploitation pouvant être démarré sans
+installation préalable sur disque dur. Les Systèmes Live ne modifient pas le
+système d'exploitation local ou les fichiers installés sur le disque dur
+sans qu'on leur en donne explicitement l'instruction. D'habitude, les
+systèmes Live sont démarrés à partir de media tels que des CD, DVD, ou des
+clés USB. Certains peuvent également être démarrés depuis le réseau.
+
+_* *{Debian Live}*: Le sous-projet Debian qui maintient les paquets
+live-boot, live-build, live-config, et live-manual.
+
+_* *{Système Debian Live}*: Un système live qui utilise les logiciels du
+système d'exploitation Debian et qui peut être lancé depuis CD, DVD, clé
+USB, en réseau (à l'aide des images netboot), et à partir d'Internet (à
+l'aide du paramètre de démarrage #{fetch=URL}#).
+
+_* *{Système hôte}*: L'environnement utilisé pour créer le système live.
+
+_* *{Système de destination}*: L'environnement utilisé pour faire tourner le
+système live.
+
+_* *{live-boot}*: Une collection de scripts utilisés pour lancer des
+systèmes live. live-boot faisait initialement partie de live-initramfs.
+
+_* *{live-build}*: Une collection de scripts utilisés pour personnaliser les
+systèmes Debian Live. live-build était initialement nommé live-package, puis
+live-helper.
+
+_* *{live-config}*: Une collection de scripts utilisés pour configurer un
+système live durant le processus de démarrage. live-config faisait
+initialement partie de live-initramfs.
+
+_* *{live-manual}*: Ce document est maintenu dans un paquet nommé
+live-manual.
+
+_* *{Debian Installer (d-i)}*: Le système d'installation officiel pour la
+distribution Debian.
+
+_* *{Paramètres de démarrage}*: Les paramètres pouvant être entrés à
+l'invite du bootloader afin de modifier le kernel ou live-config.
+
+_* *{chroot}*: Le programme chroot, chroot(8), nous permet de faire tourner
+plusieurs instances concurrentes de l'environnement GNU/Linux sur un système
+sans redémarrage.
+
+_* *{Image binaire}*: Un fichier contenant le système live, tel que
+binary.iso ou binary.img.
+
+_* *{Distribution de destination}*: La distribution sur laquelle votre
+système live sera basée. Ceci peut varier en fonction de la distribution de
+votre système hôte.
+
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: La distribution stable
+contient la dernière version officielle de Debian. La distribution testing
+est la future version stable où seuls les paquets suffisamment matures
+peuvent entrer. Un avantage de cette distribution est qu'elle contient des
+logiciels de versions plus récentes que la version stable. La distribution
+unstable est en constante évolution. En général cette distribution est
+utilisée par les développeurs et ceux qui aiment le risque.
+
+Au moment d'écrire ce document, Squeeze est la version Stable et Wheezy est
+la version testing. Sid restera toujours synonyme de version unstable.
+
+2~Auteurs
+
+La liste des auteurs (dans l'ordre alphabétique):
+
+_* Ben Armstrong
+
+_* Brendan Sleight
+
+_* Chris Lamb
+
+_* Daniel Baumann
+
+_* Franklin Piat
+
+_* Jonas Stein
+
+_* Kai Hendry
+
+_* Marco Amadori
+
+_* Mathieu Geli
+
+_* Matthias Kirschner
+
+_* Richard Nelson
+
+_* Trent W. Buck
+
+2~ Contribuer à ce document
+
+This manual is intended as a community project and all proposals for
+improvements and contributions are extremely welcome. The preferred way to
+submit a contribution is to send it to the mailing list. Please see
+{Contact}#contact for more information.
+
+Lorsque vous soumettez une contribution, veuillez indiquer clairement le
+copyright et inclure la mention légale relative à la licence. Notez que pour
+être acceptée, la contribution doit être déposée sous la même licence que le
+reste du document, c'est-à-dire la GPL version 3 ou ultérieure.
+
+Les sources de ce manuel sont maintenues à l'aide du logiciel de gestion de
+versions Git. Vous pouvez obtenir la dernière copie en exécutant:
+
+code{
+
+$ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+Avant de soumettre votre contribution, veuillez prévisualiser votre
+travail. Afin de prévisualiser live-manual, assurez-vous que les paquets
+nécessaires sont installés en exécutant:
+
+code{
+
+# apt-get install make po4a sisu-complete
+
+}code
+
+Vous pouvez compiler live-manual depuis le répertoire racine de votre
+checkout git en exécutant:
+
+code{
+
+$ make build
+
+}code
+
+3~ Appliquer des patches
+
+Les contributions directes au répertoire sont possibles pour tout le
+monde. Cependant, nous vous demandons d'envoyer les changements conséquents
+sur la liste de discussion au préalable. Afin de de faire un push sur le
+répertoire, les étapes suivantes sont nécessaires.
+
+_* Téléchargez la clé publique:
+
+code{
+
+$ mkdir -p ~/.ssh/identity.d
+$ wget http://live.debian.net/other/keys/live-manual@debian-live \
+	-O ~/.ssh/identity.d/live-manual at debian-live
+$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \
+	-O ~/.ssh/identity.d/live-manual at debian-live.pub
+$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*
+
+}code
+
+_* Ajoutez la section suivante à votre configuration openssh-client:
+
+code{
+
+$ cat >> ~/.ssh/config << EOF
+Host live.debian.net
+        Hostname live.debian.net
+        User gitosis
+        IdentityFile ~/.ssh/identity.d/live-manual at debian-live
+EOF
+
+}code
+
+_* Clonez le manuel via ssh:
+
+code{
+
+$ git clone gitosis at live.debian.net:/live-manual.git
+
+}code
+
+_* Après édition des fichiers dans manual/en/, veuillez appeler 'commit'
+dans le dossier racine du répertoire afin de de nettoyer les fichier et de
+mettre à jour les fichiers de traduction:
+
+code{
+
+$ make commit
+
+}code
+
+_* Après nettoyage, soumettre les modifications. Veuillez écrire les
+commentaires de commit à l'aide de phrases complètes, en commençant par une
+majuscule et en terminant par un point, et en commençant par
+'Fixing/Adding/Removing/Correcting/':
+
+code{
+
+$ git commit -a
+
+}code
+
+_* Envoyez votre commit au serveur:
+
+code{
+
+$ git push
+
+}code
diff --git a/manual/de/about_project.ssi b/manual/fr/about_project.ssi
similarity index 95%
copy from manual/de/about_project.ssi
copy to manual/fr/about_project.ssi
index 993ea07..473de07 100644
--- a/manual/de/about_project.ssi
+++ b/manual/fr/about_project.ssi
@@ -1,6 +1,6 @@
-:B~ Über das Debian Live Projekt
+:B~ About the Debian Live Project
 
-1~ Über das Debian Live Projekt
+1~ About the Debian Live Project
 
 2~ Motivation
 
@@ -73,20 +73,18 @@ are after a regular installation of Debian.
 Whenever we need a different default configuration, we will do that in
 coordination with its package maintainer in Debian.
 
-A system for configuring packages is provided using debconf in #{lh config}#
+A system for configuring packages is provided using debconf in #{lb config}#
 (use --preseed FILE) allowing custom configured packages to be installed in
 your custom produced Debian Live images, but for official live images only
 default configuration will be used. For more information, please see
-customization.
-
-% FIXME: <xref linkend="customization"/>
+{Customization overview}#customization-overview.
 
 Exception: There are a few essential changes needed to bring a live system
 to life (e.g. configuring pam to allow empty passwords). These essential
 changes have to be kept as minimal as possible and should be merged within
 the Debian repository if possible.
 
-2~ Contact
+2~contact Contact
 
 _* *{Mailing list}*: The primary contact for the project is the mailing list
 at http://lists.debian.org/debian-live/. You can email the list directly by
@@ -101,9 +99,7 @@ list.
 _* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs
 reported by users and developers. Each bug is given a number, and is kept on
 file until it is marked as having been dealt with. For more information,
-please see bugs.
-
-% FIXME: <xref linkend="bugs"/>
+please see {Reporting bugs}#bugs.
 
 _* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a
 place to gather information, discuss applied technologies, and document
diff --git a/manual/fr/index.html.in b/manual/fr/index.html.in
new file mode 100644
index 0000000..bdefa90
--- /dev/null
+++ b/manual/fr/index.html.in
@@ -0,0 +1,62 @@
+<html>
+
+<head>
+	<title>Projet Debian Live</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+
+<body>
+	<h2>Manuel Debian Live</h2>
+
+	<p>
+		<i>Ce manuel est en cours d'élaboration.</i>
+	</p>
+
+	<p>
+		Veuillez transmettre les erreurs, omissions, patches et suggestions sur
+notre liste de discussion <a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
+et lire  <a href="html/1.html#37">comment contribuer</a> au manuel.
+	</p>
+
+	<h3>Formats disponibles</h3>
+
+	<ul>
+		<li><a href="epub/live-manual.epub">EPUB</a></li>
+		<li>HTML: <a href="html/index.html">multi pages</a>, <a
+href="html/live-manual.html">page unique</a></li>
+		<li><a href="odf/live-manual.odt">ODF</a></li>
+		<li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape-a4.pdf">A4 paysage</a>, <a
+href="pdf/live-manual.portrait-letter.pdf">US portrait</a>, <a
+href="pdf/live-manual.landscape-letter.pdf">US paysage</a></li>
+		<li><a href="txt/live-manual.txt">Texte brut</a></li>
+	</ul>
+
+	<p>
+		Dernière modification: @DATE_CHANGE@<br />
+		Dernière compilation: @DATE_BUILD@
+	</p>
+
+	<h3>Source</h3>
+
+	<p>
+		Les sources de ce manuel sont disponibles dans un répertoire <a
+href="http://git.or.cz/">git</a> sur live.debian.net.
+	</p>
+
+	<ul>
+		<li>Parcourir: <a
+href="http://live.debian.net/gitweb/?p=live-manual.git"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></a></li>
+		<li>Git: <a
+href="git://live.debian.net/git/live-manual.git"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a></li>
+	</ul>
+
+	<p>
+		<a href="http://live.debian.net/">Debian Live</a> &lt;<a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>&gt;
+- <a href="http://live.debian.net/legal.html">Note légale</a>
+	</p>
+</body>
+
+</html>
diff --git a/manual/en/live-manual.ssm b/manual/fr/live-manual.ssm
similarity index 58%
copy from manual/en/live-manual.ssm
copy to manual/fr/live-manual.ssm
index eaca0b5..21efbbf 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,12 +9,12 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-10-03
+ :published: 2010-10-25
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
 @make:
- :bold: /lenny|stable|squeeze|testing|sid|unstable/
+ :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
  :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
  :num_top: 1
  :skin: skin_debian-live
@@ -35,46 +35,56 @@
 
 << user_overview.ssi
 
+<< user_managing_a_configuration.ssi
+
+<< user_customization-overview.ssi
+
 << user_customization-packages.ssi
 
 << user_customization-contents.ssi
 
+<< user_customization-internationalization.ssi
+
 :B~ Development ~#
 
 :B~ Project ~#
 
-:B~ Other ~#
+<< project_bugs.ssi
 
-<< other_customization-internationalization.ssi
+:B~ Other ~#
 
-<< other_customization-bootup.ssi
+Other material that formerly appeared in this section is out of date and/or
+has not been approved for release. It has therefore been omitted, but can
+still be found in the document source; see 'About this manual'. Any part of
+the omitted material that is still useful will be included in the release
+only after it has been reviewed.
 
-<< other_customization-binary.ssi
+% << other_customization-bootup.ssi
 
-<< other_customization-backports.ssi
+% << other_customization-binary.ssi
 
-<< other_common-tasks.ssi
+% << other_customization-backports.ssi
 
-<< other_live-environment.ssi
+% << other_common-tasks.ssi
 
-<< other_faq.ssi
+% << other_live-environment.ssi
 
-<< other_reporting-bugs.ssi
+% << other_faq.ssi
 
-<< other_howtos.ssi
+% << other_howtos.ssi
 
-<< other_coding-style.ssi
+% << other_coding-style.ssi
 
-<< other_procedures.ssi
+% << other_procedures.ssi
 
-<< other_resources.ssi
+% << other_resources.ssi
 
-<< other_use-cases.ssi
+% << other_use-cases.ssi
 
-<< other_success-stories.ssi
+% << other_success-stories.ssi
 
-<< other_troubleshooting.ssi
+% << other_troubleshooting.ssi
 
-<< other_configuration-layout.ssi
+% << other_configuration-layout.ssi
 
-<< other_configuration-files.ssi
+% << other_configuration-files.ssi
diff --git a/manual/de/other_coding-style.ssi b/manual/fr/other_coding-style.ssi
similarity index 100%
copy from manual/de/other_coding-style.ssi
copy to manual/fr/other_coding-style.ssi
diff --git a/manual/de/other_common-tasks.ssi b/manual/fr/other_common-tasks.ssi
similarity index 97%
copy from manual/de/other_common-tasks.ssi
copy to manual/fr/other_common-tasks.ssi
index d93643b..98cb5d7 100644
--- a/manual/de/other_common-tasks.ssi
+++ b/manual/fr/other_common-tasks.ssi
@@ -26,7 +26,7 @@ This means that Debian is installed by fetching and installing
 from the local media or some network-base network, resulting in a standard
 Debian system being installed to the hard disk.
 
-This whole process can be preseeded and customised in a number of ways; see
+This whole process can be preseeded and customized in a number of ways; see
 the relevant "DebianInstaller" wiki page and installation guide for
 more. This is operational now withing live-helper.
 
diff --git a/manual/de/other_configuration-files.ssi b/manual/fr/other_configuration-files.ssi
similarity index 100%
copy from manual/de/other_configuration-files.ssi
copy to manual/fr/other_configuration-files.ssi
diff --git a/manual/de/other_configuration-layout.ssi b/manual/fr/other_configuration-layout.ssi
similarity index 100%
copy from manual/de/other_configuration-layout.ssi
copy to manual/fr/other_configuration-layout.ssi
diff --git a/manual/de/other_customization-backports.ssi b/manual/fr/other_customization-backports.ssi
similarity index 100%
copy from manual/de/other_customization-backports.ssi
copy to manual/fr/other_customization-backports.ssi
diff --git a/manual/de/other_customization-binary.ssi b/manual/fr/other_customization-binary.ssi
similarity index 94%
copy from manual/de/other_customization-binary.ssi
copy to manual/fr/other_customization-binary.ssi
index 097216f..c717f53 100644
--- a/manual/de/other_customization-binary.ssi
+++ b/manual/fr/other_customization-binary.ssi
@@ -1,6 +1,6 @@
-B~ Customising the binary image
+B~ Customizing the binary image
 
-1~ Customising the binary image<
+1~ Customizing the binary image<
 
 2~ ISO metadata
 
diff --git a/manual/de/other_customization-bootup.ssi b/manual/fr/other_customization-bootup.ssi
similarity index 93%
copy from manual/de/other_customization-bootup.ssi
copy to manual/fr/other_customization-bootup.ssi
index f656968..4fc11a7 100644
--- a/manual/de/other_customization-bootup.ssi
+++ b/manual/fr/other_customization-bootup.ssi
@@ -1,8 +1,8 @@
-B~ Customising the bootup process
+B~ Customizing the bootup process
 
-1~ Customising the bootup process
+1~ Customizing the bootup process
 
-This chapter discusses customisation of bootup process of a live system,
+This chapter discusses customization of bootup process of a live system,
 including kernel options, modifications to the bootloader, "splash" screens
 and startup scripts.
 
diff --git a/manual/de/other_faq.ssi b/manual/fr/other_faq.ssi
similarity index 99%
copy from manual/de/other_faq.ssi
copy to manual/fr/other_faq.ssi
index 8df1daf..f754913 100644
--- a/manual/de/other_faq.ssi
+++ b/manual/fr/other_faq.ssi
@@ -183,7 +183,7 @@ You must also use the example script
 script gets built into the initramfs (read the comment header for
 instructions).
 
-Q: How do I add software not in Debian ? A: See Customising package
+Q: How do I add software not in Debian ? A: See Customizing package
 installation % FIXME: <xref linkend="packages"/>
 
 Q: What is the manifest with Ubuntu used for? A: Manifest is just the
@@ -288,7 +288,7 @@ Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref
 linkend="internalization"/>
 
 Q: How do I get past boot prompt without a working keyboard? A: See
-Customising the bootup process % FIXME: <xref linkend="bootup"/> Note: Boot
+Customizing the bootup process % FIXME: <xref linkend="bootup"/> Note: Boot
 from an USB-HDD on an iMac with GRUB did not work.
 
 Q: Can I serve the root image from a web or ftp server? A: Since
diff --git a/manual/de/other_howtos.ssi b/manual/fr/other_howtos.ssi
similarity index 100%
copy from manual/de/other_howtos.ssi
copy to manual/fr/other_howtos.ssi
diff --git a/manual/de/other_live-environment.ssi b/manual/fr/other_live-environment.ssi
similarity index 100%
copy from manual/de/other_live-environment.ssi
copy to manual/fr/other_live-environment.ssi
diff --git a/manual/de/other_procedures.ssi b/manual/fr/other_procedures.ssi
similarity index 99%
copy from manual/de/other_procedures.ssi
copy to manual/fr/other_procedures.ssi
index a0c193f..2ecf1ca 100644
--- a/manual/de/other_procedures.ssi
+++ b/manual/fr/other_procedures.ssi
@@ -96,7 +96,7 @@ Download location of updated images:
 
   <http://cdimage.debian.org/cdimage/release/current-live/>
 
-Debian Live Projekt Homepage:
+Debian Live project homepage:
 
   <http://live.debian.net/>
 
diff --git a/manual/de/other_resources.ssi b/manual/fr/other_resources.ssi
similarity index 100%
copy from manual/de/other_resources.ssi
copy to manual/fr/other_resources.ssi
diff --git a/manual/de/other_success-stories.ssi b/manual/fr/other_success-stories.ssi
similarity index 100%
copy from manual/de/other_success-stories.ssi
copy to manual/fr/other_success-stories.ssi
diff --git a/manual/de/other_troubleshooting.ssi b/manual/fr/other_troubleshooting.ssi
similarity index 100%
copy from manual/de/other_troubleshooting.ssi
copy to manual/fr/other_troubleshooting.ssi
diff --git a/manual/de/other_use-cases.ssi b/manual/fr/other_use-cases.ssi
similarity index 100%
copy from manual/de/other_use-cases.ssi
copy to manual/fr/other_use-cases.ssi
diff --git a/manual/de/other_reporting-bugs.ssi b/manual/fr/project_bugs.ssi
similarity index 63%
copy from manual/de/other_reporting-bugs.ssi
copy to manual/fr/project_bugs.ssi
index cf0c72a..c82d6cf 100644
--- a/manual/de/other_reporting-bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -1,6 +1,6 @@
 B~ Reporting bugs
 
-1~ Reporting bugs
+1~bugs Reporting bugs
 
 Debian Live is far from being perfect, but we want to make it as close as
 possible to perfect - with your help. Do not hesitate to report a bug: it is
@@ -12,30 +12,30 @@ For the impatient:
 _* Always check first the image status updates on our homepage at
 http://live.debian.net/ for known issues.
 
-_* Always try to reproduce the bug with the *{most recent version}* of
-live-helper and live-initramfs before submitting a bug report.
+_* Always try to reproduce the bug with the *{most recent versions}* of
+live-build, live-boot, and live-config before submitting a bug report.
 
 _* Try to give *{as specific information as possible}* about the bug. This
-includes (at least) the version of live-helper and live-initramfs used and
-the distribution of the live system you are building.
+includes (at least) the version of live-build, live-boot, and live-config
+used and the distribution of the live system you are building.
 
 2~ Known issues
 
-Due to the nature of Debian testing and Debian unstable branches being a
-moving target, building a live system may not always be possible.
+Due to the nature of Debian testing and Debian unstable distributions being
+a moving target, building a live system may not always be possible.
 
 If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-helper does always default to the current stable
+but go with stable. live-build does always default to the current stable
 release.
 
 Currently known issues are listed under the section 'status' on our homepage
 at http://live.debian.net/
 
 It is out of the scope of this manual to train you in correctly identifying
-and fixing problems in packages of the development branches, however, there
-are two things you can always try: When not succeeding to build testing, try
-if unstable works. If unstable does not work either, revert to testing and
-pinning the newer version of the failing package from unstable.
+and fixing problems in packages of the development distributions, however,
+there are two things you can always try: When not succeeding to build
+testing, try if unstable works. If unstable does not work either, revert to
+testing and pinning the newer version of the failing package from unstable.
 
 2~ Rebuild from scratch
 
@@ -46,15 +46,12 @@ is reproducible.
 2~ Use up-to-date packages
 
 Using outdated packages can cause significant problems when trying to
-reproduce (and ultimately fix) your problem. If a relevant package is not
-available in Debian anymore, please recognize that the resources of the
-Debian kernel team are limited and will be unlikely to be able to fix the
-problem.
+reproduce (and ultimately fix) your problem.
 
-2~ Collect information
+2~collect-information Collect information
 
 Please provide enough information with your report. At a minimum, it should
-contain the exact version of live-helper version where the bug is
+contain the exact version of live-build version where the bug is
 encountered, and steps to reproduce it. Please use common sense and include
 other relevant information if you think that it might help in solving the
 problem.
@@ -64,9 +61,11 @@ information:
 
 _* Architecture of the host system
 
-_* Version of live-helper on the host system
+_* Version of live-build on the host system
+
+_* Version of live-boot on the live system
 
-_* Version of live-initramfs on the live system
+_* Version of live-config on the live system
 
 _* Version of debootstrap and/or cdebootstrap on the host system
 
@@ -78,7 +77,11 @@ _* Version of the kernel on the live system
 
 You can generate a log of the build process by using the tee command:
 
-% code{ % % lh_build 2>&1 | tee buildlog.txt % % }code
+code{
+
+lb build 2>&1 | tee build.log
+
+}code
 
 Additionally, to rule out other errors, it is always a good idea to tar up
 your config directory and upload it somewhere (do *{not}* send it as an
@@ -86,7 +89,7 @@ attachment to the mailinglist), so that we can try to reproduce the errors
 you encountered.
 
 Remember to send in any logs that were produced with English locale
-settings, e.g. run your live-helper commands with a leading #{LC_ALL=C}# or
+settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or
 #{LC_ALL=en_US}#.
 
 2~ Use the correct package to report the bug against
@@ -95,26 +98,26 @@ Where does the bug appear?
 
 3~ At build time whilst bootstrapping
 
-live-helper first bootstraps a basic Debian system with #{debootstrap}# or
+live-build first bootstraps a basic Debian system with #{debootstrap}# or
 #{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian
 distribution it is bootstrapping, it may fail. If a bug appears here, check
 if the error is related to a specific Debian package (most likely), or if it
-is related to cdebootstrap itself.
+is related to bootstrapping tool itself.
 
 In both cases, this is not a bug in Debian Live, but rather in Debian itself
-which we can not fix this directly. Please report such a bug against
-#{debootstrap}#, #{cdebootstrap}# or the failing package.
+which we can not fix this directly. Please report such a bug against the
+bootstrapping tool or the failing package.
 
 3~ At build time whilst installing packages
 
-live-helper installs additional packages from the Debian archive and
+live-build installs additional packages from the Debian archive and
 depending on the Debian distribution used and the daily archive state, it
 can fail. If a bug appears here, check if the error is also reproducible on
 a normal system.
 
 If this is the case, this is not a bug in Debian Live, but rather in Debian
 - please report it against the failing package. Running debootstrap
-seperately from the Live system build or running lh_bootstrap with
+seperately from the Live system build or running lb bootstrap with
 #{--debug}# will give you more information.
 
 Also, if you are using a local mirror and/or any of sort of proxy and you
@@ -124,11 +127,12 @@ bootstrapping from an official mirror.
 3~ At boot-time
 
 If your image does not boot, please report it to the mailing list together
-with the information requested in collect-information. Do not forget to
-mention, how/when the image failed, in Qemu, VMWare or real hardware. If you
-are using a virtualization technology of any kind, please always run it on
-real hardware before reporting a bug. Providing a screenshot of the failure
-is also very helpful.  % FIXME: <xref linkend="collect-information"/>
+with the information requested in {Collect
+information}#collect-information. Do not forget to mention, how/when the
+image failed, in Qemu, VMWare or real hardware. If you are using a
+virtualization technology of any kind, please always run it on real hardware
+before reporting a bug. Providing a screenshot of the failure is also very
+helpful.
 
 3~ At run-time
 
@@ -148,9 +152,9 @@ as the homepage, as these are likely to contain the most up-to-date
 information. If such information exists, always include the references to it
 in your bug report.
 
-In addition, you should check the current bug list for live-helper and the
-current bug list for live-initramfs at to see whether something similar has
-been reported already.
+In addition, you should check the current bug lists for live-build,
+live-boot, and live-config to see whether something similar has been
+reported already.
 
 2~ Where to report bugs
 
@@ -159,13 +163,12 @@ System (BTS). For information on how to use the system, please see
 http://bugs.debian.org/. You can also submit the bugs by using the
 #{reportbug}# command from the package with the same name.
 
-In general, you should report build time errors against the live-helper
-package and run time errors against live-initramfs. If you are unsure of
-which package is appropriate or need more help before submitting a bug
-report, please send a message to the mailing list and we will help you to
-figure it out.
+In general, you should report build time errors against the live-build
+package, boot time errors against live-boot, and run time errors against
+live-config. If you are unsure of which package is appropriate or need more
+help before submitting a bug report, please send a message to the mailing
+list and we will help you to figure it out.
 
 Please note that bugs found in distributions derived from Debian (such as
-Ubuntu, Knoppix, Xandros, etc.) should *{not}* be reported to the Debian BTS
-unless they can be also reproduced on a Debian system using official Debian
-packages.
+Ubuntu and others) should *{not}* be reported to the Debian BTS unless they
+can be also reproduced on a Debian system using official Debian packages.
diff --git a/manual/de/user_basics.ssi b/manual/fr/user_basics.ssi
similarity index 93%
copy from manual/de/user_basics.ssi
copy to manual/fr/user_basics.ssi
index f9b0843..aef09b7 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -10,9 +10,7 @@ containing instructions on how to boot the various binary image types.
 A live system usually means an operating system booted on a computer from a
 removable medium (such as CD-ROM, USB stick, or network), ready to use
 without any installation on the usual drive(s), with an auto-configuration
-done at runtime (see terms).
-
-% FIXME: <xref linkend="terms"/>
+done at runtime (see {Terms}#terms ).
 
 With Debian Live, it's a Debian GNU/Linux operating system, built for one of
 the supported architectures (currently amd64, i386, powerpc and sparc). It
@@ -26,8 +24,8 @@ _* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
 containing modules possibly needed to mount the filesystem's image and some
 scripts to do it.
 
-_* *{System image}*: The operating systems filesystem image. Debian Live
-uses SquashFS, a compressed filesystem, to minimize its image size. Note
+_* *{System image}*: The operating systems filesystem image. The SquashFS
+compressed filesystem is used to minimize the Debian Live image size. Note
 that it's read-only. So, during boot the Debian Live system will use a RAM
 disk and 'union' mechanism to enable writing files within the running
 system. However, all modifications will be lost upon shutdown unless
@@ -65,9 +63,7 @@ $ lb config
 }code
 
 By passing no parameters to #{lb config}# we indicated that we wish to use
-the defaults (see lb-config).
-
-% FIXME: <xref linkend="lb-config"/>
+the defaults (see {The lb config command}#lb-config ).
 
 Now that we have a "config/" hierarchy, we may build the image with the lb
 build command:
@@ -79,9 +75,7 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network
-connection (see lb-build).
-
-% FIXME: <xref linkend="lb-build"/>
+connection (see {The lb build command}#lb-build ).
 
 3~ Testing an ISO image with Qemu
 
@@ -111,6 +105,19 @@ build the required kernel modules to run virtualbox-ose.
 After successful installation, virtualbox can be e.g. found in the GNOME
 menu under 'Applications/System Tools/VirtualBox OSE'.
 
+Please consider including of following packages onto the live image to
+achieve higher resolution of the display when booting the live image in
+virutalbox-ose (1280x1024 instead of 800x600 and in particular if the
+default resolution of the virtualbox-ose display shouldn't work with the
+gui-installer).
+
+code{
+
+virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
+virtualbox-ose-guest-x11
+
+}code
+
 3~ Burning an ISO image to a physical medium
 
 Burning an ISO image is easy:
@@ -131,9 +138,8 @@ booting from USB sticks, USB hard drives, and various other portable storage
 devices.
 
 Note if you created an iso image with the previous example, you will need to
-clean up your working directory with the #{lb clean} command (see lb-clean):
-
-% FIXME: <xref linkend="lb-clean"/>
+clean up your working directory with the #{lb clean} command (see {The lb
+clean command}#lb-clean ):
 
 code{
 
@@ -321,7 +327,7 @@ code{
 
 dpkg-reconfigure -plow tftpd-hpa
 
-code}
+}code
 
 and fill in the new tftp server directory when being asked about it.
 
diff --git a/manual/de/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
similarity index 96%
copy from manual/de/user_customization-contents.ssi
copy to manual/fr/user_customization-contents.ssi
index 7c43045..df28e53 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -1,8 +1,8 @@
-B~ Customising contents
+B~ Customizing contents
 
-1~ Customising contents
+1~customizing-contents Customizing contents
 
-This chapter discusses further customisation of the live system.
+This chapter discusses further customization of the live system.
 
 2~ Includes
 
diff --git a/manual/fr/user_customization-internationalization.ssi b/manual/fr/user_customization-internationalization.ssi
new file mode 100644
index 0000000..beb134a
--- /dev/null
+++ b/manual/fr/user_customization-internationalization.ssi
@@ -0,0 +1,49 @@
+B~ Customizing locale and language
+
+1~customizing-locale-and-language Customizing locale and language
+
+2~ Default locale and keyboard
+
+The default locale when building a live cd is "locales=en_US.UTF-8", to set
+the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
+
+code{
+
+$ lb config --bootappend-live "locales=de_CH.UTF-8"
+
+}code
+
+The entry for a Swiss-German keyboard would be:
+
+code{
+
+$ lb config --bootappend-live "keyboard-layouts=ch"
+
+}code
+
+Combined, the keyboard and locale configured for Switzerland would be:
+
+code{
+
+$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
+
+}code
+
+Note: You can find a list of options in the manpage for
+live-config. Currently, only UTF-8 locales are supported.
+
+2~ l10n Packages
+
+An experimental feature of live-build is to automatically check for each
+package for which it is know that there are -l10n packages available and
+install them. To add German packages the entry would be
+
+code{
+
+$ lb config --language "de"
+
+}code
+
+This will also change the default syslinux language if translations are
+available or local translations have been put into
+#{config/templates/syslinux/de}#.
diff --git a/manual/fr/user_customization-overview.ssi b/manual/fr/user_customization-overview.ssi
new file mode 100644
index 0000000..517ca3d
--- /dev/null
+++ b/manual/fr/user_customization-overview.ssi
@@ -0,0 +1,13 @@
+B~ Customizing contents
+
+1~customization-overview Customization overview
+
+% FIXME: just a stub for now.  In conversational style, cover the different
+kinds of customization % and link to each section within the text.
+
+This chapter gives an overview of the various ways in which your Debian live
+systems may be customized. See sections {Customizing package
+installation}#customizing-package-installation, {Customizing
+contents}#customizing-contents and {Customizing locale and
+language}#customizing-locale-and-language.
+
diff --git a/manual/de/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
similarity index 93%
copy from manual/de/user_customization-packages.ssi
copy to manual/fr/user_customization-packages.ssi
index b848d7f..29fb5eb 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -1,6 +1,6 @@
-:B~ Customising package installation
+:B~ Customizing package installation
 
-1~ Customising package installation
+1~customizing-package-installation Customizing package installation
 
 _* Selecting additional packages to be installed
 
@@ -174,6 +174,17 @@ in order to be processed. Local packages lists always override package lists
 distributed with live-build. This can cause undesired effects, we therefore
 recommend to use unique names for local packages lists.
 
+*{Local binary packages lists}*
+
+In case you want to include some required .deb packages to live media's
+pool/ (without installing them onto the live image) you may need to use
+lists using binary local package lists stored in
+#{config/binary_local-packageslists}#. Such media can be used as a
+customized debian install image for offline installations.
+
+Package lists that exist in this directory need to have a .list suffix in
+order to be processed.
+
 *{Extending a provided package list using includes}*
 
 % FIXME
@@ -248,7 +259,7 @@ _* #{chroot_local-packages}#
 _* Using a custom APT repository
 
 The #{chroot_local-packages}# is simpler to achieve and useful for "one-off"
-customisations but has a number of drawbacks, whilst using a custom APT
+customizations but has a number of drawbacks, whilst using a custom APT
 repository is more time-consuming to set up.
 
 3~ Using #{chroot_local-packages}# to install custom packages
diff --git a/manual/de/user_installation.ssi b/manual/fr/user_installation.ssi
similarity index 90%
copy from manual/de/user_installation.ssi
copy to manual/fr/user_installation.ssi
index d330950..9869ff4 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -84,7 +84,9 @@ and uninstall it with:
 
 code{
 
-# make uninstall }code
+# make uninstall
+
+}code
 
 3~ From 'snapshots'
 
@@ -94,14 +96,12 @@ are available on http://live.debian.net/debian/.
 
 2~ live-boot
 
-*{Note:}* You do not need to install live-boot on your system to create customised Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
 
-3~ Using a customised live-boot
+3~ Using a customized live-boot
 
 To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in terms.
-
-% FIXME: <xref linkend="terms"/>
+familiar with the terms mentioned in {Terms}#terms .
 
 _* Checkout the live-boot source
 
@@ -120,8 +120,8 @@ should name it without dashes '-', e.g: call it "99new_feature" and not
 _* Build a live-boot .deb
 
 You must build either on your target distribution or in a chroot containing
-your target platform: this means if your target is squeeze then you should
-build against squeeze. You can use a personal builder such as /{pbuilder}/
+your target platform: this means if your target is Squeeze then you should
+build against Squeeze. You can use a personal builder such as /{pbuilder}/
 or /{sbuild}/ to automate building packages in chroot. To build directly on
 the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/
 package):
diff --git a/manual/fr/user_managing_a_configuration.ssi b/manual/fr/user_managing_a_configuration.ssi
new file mode 100644
index 0000000..3047ef0
--- /dev/null
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -0,0 +1,83 @@
+:B~ Managing a configuration
+
+1~ Managing a configuration
+
+This chapter explains how to manage a live configuration from initial
+creation, through successive revisions and successive releases of both the
+live-build software and the live image itself.
+
+2~ Use auto to manage configuration changes
+
+Live configurations rarely are perfect on the first try. You'll likely need
+to make a series of revisions until you are satisfied. However,
+inconsistencies can creep into your configuration from one revision to the
+next if you aren't careful. The main problem is, once a variable is given a
+default value, that value will not be recomputed from other variables that
+may change in later revisions.
+
+For example, when the distribution is first set, many 'dependent' variables
+are given default values that suit that distribution. However, if you later
+decide to change the distribution, those dependent variables continue to
+retain old values that are no longer appropriate.
+
+A second, related problem is that if you run #{lb config}# and then upgrade
+to a new version of live-build that has changed one of the variable names,
+you will discover this only by manual review of the variables in your config
+files, which you will then need to use to set the appropriate option again.
+
+All of this would be a terrible nuisance if it weren't for auto/* scripts,
+simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
+that are designed to help you manage your configuration. Simply create an
+auto/config script containing #{lb config}# command with all desired
+options, and an auto/clean that removes the files containing configuration
+variable values, and each time you #{lb config}# and #{lb clean}#, these
+files will be executed. This will ensure that your configuration is kept
+internally consistent from one revision to the next and from one live-build
+release to the next (though you will still have to take care and read the
+documentation when you upgrade live-build and make adjustments as needed).
+
+2~ Example auto scripts
+
+Use the following auto script examples as the starting point for your new
+live-build configuration. Take note that when you call the #{lb}# command
+that the auto script wraps, you must specify #{noauto}# as its parameter to
+ensure that the auto script isn't called again, recursively.
+
+auto/config
+
+code{
+
+#!/bin/sh
+lb config noauto \
+	--architecture i386 \
+	${@}
+
+}code
+
+auto/clean
+
+code{
+
+#!/bin/sh
+lb clean noauto ${@}
+rm -f config/binary config/bootstrap \
+	config/chroot config/common config/source
+rm -f binary.log
+
+}code
+
+auto/build
+
+code{
+
+#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log
+
+}code
+
+Edit auto/config, changing or adding any options as you see fit. In the
+example above, --architecture is set to i386 so that when the image is built
+on an amd64 system, it will not default to building amd64 images. Change
+this to an appropriate value for your image (or delete it if you want to use
+the default) and add any additional options in continuation lines that
+follow.
+
diff --git a/manual/de/user_overview.ssi b/manual/fr/user_overview.ssi
similarity index 84%
copy from manual/de/user_overview.ssi
copy to manual/fr/user_overview.ssi
index 49fdf79..9c7e8ff 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -2,10 +2,10 @@
 
 1~ Overview of tools
 
-This chapter contains an overview of the two main tools used in building
-Debian Live systems.
+This chapter contains an overview of the three main tools used in building
+Debian Live systems: live-build, live-boot and live-config.
 
-2~ live-build
+2~live-build live-build
 
 live-build is a collection of scripts to build Debian Live systems. These
 scripts are also referred to as "commands".
@@ -30,9 +30,7 @@ each command.
 Unlike debhelper, live-build contains a tool to generate a skeleton
 configuration directory, #{lb config}#. This could be considered to be
 similar to tools such as #{dh-make}#. For more information about #{lb
-config}#, please see lb-config.
-
-% FIXME: <xref linkend="lb-config"/>
+config}#, please see {The lb config command}#lb-config.
 
 Besides the common config/common, which is used by all live-build commands,
 some additional files can be used to configure the behavior of specific
@@ -65,35 +63,24 @@ dpkg --print-architecture and "dist" is the same as the codename of the
 target distribution), then they will be used in preference to the other,
 more general files.
 
-Please see installation for information on how to install live-build.
-
-% FIXME: <xref linkend="installation"/>
-
 The remainder of this section discusses the three most important commands:
 
-_* *{lb config}*: Responsible for initialising a Live system configuration
-directory. See lb-config for more information.
-
-% FIXME: <xref linkend="lb-config"/>
-
-_* *{lb build}*: Responsible for starting a Live system build. See lb-build
-for more information.
+_* *{lb config}*: Responsible for initializing a Live system configuration
+directory. See {The lb config command}#lb-config for more information.
 
-% FIXME: <xref linkend="lb-build"/>
+_* *{lb build}*: Responsible for starting a Live system build. See {The lb
+build command}#lb-build for more information.
 
 _* *{lb clean}*: Responsible for removing parts of a Live system build. See
-lb-clean for more information.
+{The lb clean command}#lb-clean for more information.
 
-% FIXME: <xref linkend="lb-clean"/
+3~lb-config The #{lb config}# command
 
-3~ The #{lb config}# command
-
-As discussed in live-build, the scripts that make up live-build source their
-configuration from a single directory named config/. As constructing this
-directory by hand would be time-consuming and error-prone, the #{lb config}#
-command can be used to create skeleton configuration folders.
-
-% FIXME: <xref linkend="live-build"/>
+As discussed in {live-build}#live-build, the scripts that make up live-build
+source their configuration from a single directory named config/. As
+constructing this directory by hand would be time-consuming and error-prone,
+the #{lb config}# command can be used to create skeleton configuration
+folders.
 
 Issuing #{lb config}# without any arguments creates a config subdirectory
 which it populates with some default settings:
@@ -156,18 +143,18 @@ $ lb config --binary-images net --hostname live-machine --username live-user
 A full list of options is available in the #{lb_config}# man page. Most
 options have a parallel with an "LB_" prefixed variable.
 
-3~ The #{lb build}# command
+3~lb-build The #{lb build}# command
 
 The #{lb build}# command reads in your configuration from the config/
 directory. It then runs the lower lower level commands needed to build your
 Live system.
 
-3~ The #{lb clean}# command
+3~lb-clean The #{lb clean}# command
 
 It is the job of the #{lb clean}# command to remove various parts of a build
 so subsequent builds can start from a clean state.
 
-2~ The live-boot package
+2~live-boot The live-boot package
 
 live-boot is a collection of scripts providing hooks for the
 initramfs-tools, used to generate an initramfs capable of booting live
@@ -182,3 +169,11 @@ Debian like systems to boot from.
 More information on initial ramfs in Debian can be found in the Debian Linux
 Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter
 on initramfs.
+
+2~live-config The live-config package
+
+live-config consists of the scripts that run at boot time after live-boot to
+configure the live system automatically. It handles such tasks as setting
+the hostname, locales and timezone, creating the live user, inhibiting cron
+jobs and performing autologin of the live user.
+
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index ad28636..b3b1028 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-22 08:36-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -48,7 +48,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:10
-msgid "2~ Terms"
+msgid "2~terms Terms"
 msgstr ""
 
 #. type: Plain text
@@ -57,8 +57,8 @@ msgid ""
 "_* *{Live system}*: An operating system that can boot without installation "
 "to a hard drive. Live systems do not alter local operating system(s) or file"
 "(s) already installed on the computer hard drive unless instructed to do so. "
-"Live systems are typically booted from media such as CDs/DVDs or USB sticks, "
-"some may also boot over the network."
+"Live systems are typically booted from media such as CDs, DVDs or USB "
+"sticks. Some may also boot over the network."
 msgstr ""
 
 #. type: Plain text
@@ -73,7 +73,7 @@ msgstr ""
 msgid ""
 "_* *{Debian Live system}*: A live system that uses software from the Debian "
 "operating system that may be booted from CDs, DVDs, USB sticks, over the "
-"network (via netboot images), and over the internet (via boot parameter #"
+"network (via netboot images), and over the Internet (via boot parameter #"
 "{fetch=URL}#)."
 msgstr ""
 
@@ -97,15 +97,15 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:24
 msgid ""
-"_* *{live-build}*: A collection of scripts used to build customised Debian "
-"Live systems. live-build was formerly know as live-helper, and even earlier "
-"know as live-package."
+"_* *{live-build}*: A collection of scripts used to build customized Debian "
+"Live systems. live-build was formerly known as live-helper, and even earlier "
+"known as live-package."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:26
 msgid ""
-"_* *{live-config}*: A collection of scripts used to configure a live systems "
+"_* *{live-config}*: A collection of scripts used to configure a live system "
 "during the boot process. live-config was formerly a part of live-initramfs."
 msgstr ""
 
@@ -119,7 +119,7 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:30
 msgid ""
-"_* *{Debian Installer/(d-i)}*: The official installation system for the "
+"_* *{Debian Installer (d-i)}*: The official installation system for the "
 "Debian distribution."
 msgstr ""
 
@@ -141,21 +141,21 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:36
 msgid ""
-"_* *{Binary image}*: On a live system, binary image refers to the binary "
-"filesystem and the respective extension, such as binary.iso or binary.img."
+"_* *{Binary image}*: A file containing the live system, such as binary.iso "
+"or binary.img."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:38
 msgid ""
 "_* *{Target distribution}*: The distribution upon which your live system "
-"will be based. This can differ from the distribution of your Build System."
+"will be based. This can differ from the distribution of your host system."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:40
 msgid ""
-"_* *{squeeze/wheezy/sid stable/testing/unstable}*: The stable distribution "
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
 "contains the latest officially released distribution of Debian. The testing "
 "distribution is the staging area for the next stable release. A major "
 "advantage of using this distribution is that it has more recent versions of "
@@ -167,8 +167,8 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:42
 msgid ""
-"At the time of writing, squeeze is the current stable release and wheezy is "
-"the current testing release. sid will always be a synonym for the unstable "
+"At the time of writing, Squeeze is the current stable release and Wheezy is "
+"the current testing release. Sid will always be a synonym for the unstable "
 "release."
 msgstr ""
 
@@ -252,34 +252,29 @@ msgstr ""
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see contact "
-"for more information."
+"submit a contribution is to send it to the mailing list. Please see {Contact}"
+"#contact for more information."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:76
-msgid "% FIXME: <xref linkend=\"contact\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:78
 msgid ""
-"When submitting a contribution please clearly identify its copyright holder "
-"and include the licensing statement. Note that to be accepted the "
+"When submitting a contribution, please clearly identify its copyright holder "
+"and include the licensing statement. Note that to be accepted, the "
 "contribution must be licensed under the same license as the rest of the "
-"document, namely GPL version 3 or later."
+"document, namely, GPL version 3 or later."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:78
 msgid ""
 "The sources for this manual are maintained using the Git version control "
 "system. You can checkout the latest copy by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -287,61 +282,63 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84
+#: en/about_manual.ssi:82
 msgid "$ git clone git://live.debian.net/git/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -350,17 +347,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -370,35 +362,43 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:88
+#: en/about_manual.ssi:86
 msgid ""
 "Prior to submission of your contribution, please preview your work. To "
 "preview the live-manual, ensure the packages needed for building are "
@@ -406,49 +406,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:92
-msgid "# apt-get install sisu-complete"
+#: en/about_manual.ssi:90
+msgid "# apt-get install make po4a sisu-complete"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:96
+#: en/about_manual.ssi:94
 msgid ""
 "You may build the live-manual from the top level directory of your git "
 "checkout by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:100
+#: en/about_manual.ssi:98
 msgid "$ make build"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:102
 msgid "3~ Applying patches"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:104
 msgid ""
 "Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailinglist to discuss them first. In "
+"you to send bigger changes to the mailing list to discuss them first. In "
 "order to push to the repository, the following steps are required."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:108
+#: en/about_manual.ssi:106
 msgid "_* Fetch the public commit key:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:115
+#, no-wrap
 msgid ""
-"$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/"
-"repository-public-commit-key-current/live-manual at debian-live -O ~/.ssh/"
-"identity.d/live-manual at debian-live $ wget http://live.debian.net/other/"
-"openssh/repository-public-commit-key-current/live-manual at debian-live.pub -O "
-"~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600 ~/.ssh/identity.d/"
-"live-manual at debian-live*"
+"$ mkdir -p ~/.ssh/identity.d\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
 msgstr ""
 
 #. type: Plain text
@@ -482,7 +483,7 @@ msgstr ""
 #: en/about_manual.ssi:140
 msgid ""
 "_* After editing the files in manual/en/, please call the 'commit' target in "
-"the toplevel directory to sanitize the files and update the translation "
+"the top level directory to sanitize the files and update the translation "
 "files:"
 msgstr ""
 
diff --git a/manual/po/de/about_project.ssi.po b/manual/po/de/about_project.ssi.po
index 3393dba..f41eb26 100644
--- a/manual/po/de/about_project.ssi.po
+++ b/manual/po/de/about_project.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -192,20 +192,15 @@ msgstr ""
 #. type: Plain text
 #: en/about_project.ssi:60
 msgid ""
-"A system for configuring packages is provided using debconf in #{lh config}# "
+"A system for configuring packages is provided using debconf in #{lb config}# "
 "(use --preseed FILE) allowing custom configured packages to be installed in "
 "your custom produced Debian Live images, but for official live images only "
 "default configuration will be used. For more information, please see "
-"customization."
+"{Customization overview}#customization-overview."
 msgstr ""
 
 #. type: Plain text
 #: en/about_project.ssi:62
-msgid "% FIXME: <xref linkend=\"customization\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:64
 msgid ""
 "Exception: There are a few essential changes needed to bring a live system "
 "to life (e.g. configuring pam to allow empty passwords). These essential "
@@ -214,12 +209,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:66
-msgid "2~ Contact"
+#: en/about_project.ssi:64
+msgid "2~contact Contact"
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:68
+#: en/about_project.ssi:66
 msgid ""
 "_* *{Mailing list}*: The primary contact for the project is the mailing list "
 "at http://lists.debian.org/debian-live/. You can email the list directly by "
@@ -228,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:70
+#: en/about_project.ssi:68
 msgid ""
 "_* *{IRC}*: A number of users and developers are present in the #debian-live "
 "channel on irc.debian.org (OFTC). When asking a question on IRC, please be "
@@ -237,21 +232,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:72
+#: en/about_project.ssi:70
 msgid ""
 "_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
 "reported by users and developers. Each bug is given a number, and is kept on "
 "file until it is marked as having been dealt with. For more information, "
-"please see bugs."
-msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:74
-msgid "% FIXME: <xref linkend=\"bugs\"/>"
+"please see {Reporting bugs}#bugs."
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:75
+#: en/about_project.ssi:71
 msgid ""
 "_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
 "place to gather information, discuss applied technologies, and document "
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
index 54a77a2..8b8d8df 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/de/index.html.in.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a3\n"
-"POT-Creation-Date: 2010-10-03 12:43+0300\n"
+"POT-Creation-Date: 2010-10-20 20:02+0300\n"
 "PO-Revision-Date: 2010-06-06 15:21+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -37,14 +37,14 @@ msgstr ""
 msgid ""
 "Please report errors, omissions, patches and suggestions to our mailinglist "
 "at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/meta.html#contributing\">how to "
-"contribute</a> to the manual."
+"org</a> and read about <a href=\"html/1.html#37\">how to contribute</a> to "
+"the manual."
 msgstr ""
 "Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste "
 "unter <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists."
 "debian.org</a> (englischspraching) gemeldet werden. Informationen wie man <a "
-"href=\"html/meta.html#contributing\">zum Handbuch beitragen</a> kann, können "
-"im Handbuch gefunden werden."
+"href=\"html/1.html#37\">zum Handbuch beitragen</a> kann, können im Handbuch "
+"gefunden werden."
 
 #. type: Content of: <html><body><h3>
 #: en/index.html.in:18
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index bb7f289..e8d932c 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-25 23:12+0300\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-10-03\n"
+" :published: 2010-10-25\n"
 msgstr ""
 
 #. type: Plain text
@@ -58,7 +58,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@make:\n"
-" :bold: /lenny|stable|squeeze|testing|sid|unstable/\n"
+" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
 " :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
 " :num_top: 1\n"
 " :skin: skin_debian-live\n"
@@ -106,110 +106,130 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:39
-msgid "<< user_customization-packages.ssi"
+msgid "<< user_managing_a_configuration.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:41
-msgid "<< user_customization-contents.ssi"
+msgid "<< user_customization-overview.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:43
-msgid ":B~ Development ~#"
+msgid "<< user_customization-packages.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:45
-msgid ":B~ Project ~#"
+msgid "<< user_customization-contents.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid ":B~ Other ~#"
+msgid "<< user_customization-internationalization.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid "<< other_customization-internationalization.ssi"
+msgid ":B~ Development ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:51
-msgid "<< other_customization-bootup.ssi"
+msgid ":B~ Project ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:53
-msgid "<< other_customization-binary.ssi"
+msgid "<< project_bugs.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
-msgid "<< other_customization-backports.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:57
-msgid "<< other_common-tasks.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:59
-msgid "<< other_live-environment.ssi"
+msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:61
-msgid "<< other_faq.ssi"
+msgid ""
+"Other material that formerly appeared in this section is out of date and/or "
+"has not been approved for release. It has therefore been omitted, but can "
+"still be found in the document source; see 'About this manual'. Any part of "
+"the omitted material that is still useful will be included in the release "
+"only after it has been reviewed."
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:63
-msgid "<< other_reporting-bugs.ssi"
+msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:65
-msgid "<< other_howtos.ssi"
+msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:67
-msgid "<< other_coding-style.ssi"
+msgid "% << other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:69
-msgid "<< other_procedures.ssi"
+msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:71
-msgid "<< other_resources.ssi"
+msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:73
-msgid "<< other_use-cases.ssi"
+msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:75
-msgid "<< other_success-stories.ssi"
+msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:77
-msgid "<< other_troubleshooting.ssi"
+msgid "% << other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:79
-msgid "<< other_configuration-layout.ssi"
+msgid "% << other_procedures.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:81
+msgid "% << other_resources.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:83
+msgid "% << other_use-cases.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:85
+msgid "% << other_success-stories.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:87
+msgid "% << other_troubleshooting.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:89
+msgid "% << other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:80
-msgid "<< other_configuration-files.ssi"
+#: en/live-manual.ssm:90
+msgid "% << other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/po/de/other_common-tasks.ssi.po b/manual/po/de/other_common-tasks.ssi.po
index 10396a9..e176937 100644
--- a/manual/po/de/other_common-tasks.ssi.po
+++ b/manual/po/de/other_common-tasks.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,84 +17,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,28 +102,36 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
@@ -190,7 +195,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_common-tasks.ssi:18
 msgid ""
-"This whole process can be preseeded and customised in a number of ways; see "
+"This whole process can be preseeded and customized in a number of ways; see "
 "the relevant \"DebianInstaller\" wiki page and installation guide for more. "
 "This is operational now withing live-helper."
 msgstr ""
diff --git a/manual/po/de/other_customization-binary.ssi.po b/manual/po/de/other_customization-binary.ssi.po
index 18724ed..98cf44e 100644
--- a/manual/po/de/other_customization-binary.ssi.po
+++ b/manual/po/de/other_customization-binary.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,12 +18,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/other_customization-binary.ssi:2
-msgid "B~ Customising the binary image"
+msgid "B~ Customizing the binary image"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-binary.ssi:4
-msgid "1~ Customising the binary image<"
+msgid "1~ Customizing the binary image<"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/other_customization-bootup.ssi.po b/manual/po/de/other_customization-bootup.ssi.po
index 360517d..30942ae 100644
--- a/manual/po/de/other_customization-bootup.ssi.po
+++ b/manual/po/de/other_customization-bootup.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,84 +17,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,46 +102,54 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:2
-msgid "B~ Customising the bootup process"
+msgid "B~ Customizing the bootup process"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:4
-msgid "1~ Customising the bootup process"
+msgid "1~ Customizing the bootup process"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:6
 msgid ""
-"This chapter discusses customisation of bootup process of a live system, "
+"This chapter discusses customization of bootup process of a live system, "
 "including kernel options, modifications to the bootloader, \"splash\" "
 "screens and startup scripts."
 msgstr ""
diff --git a/manual/po/de/other_faq.ssi.po b/manual/po/de/other_faq.ssi.po
index de35d69..3db182c 100644
--- a/manual/po/de/other_faq.ssi.po
+++ b/manual/po/de/other_faq.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,84 +17,81 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,28 +102,36 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
@@ -466,7 +471,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_faq.ssi:163
 msgid ""
-"Q: How do I add software not in Debian ? A: See Customising package "
+"Q: How do I add software not in Debian ? A: See Customizing package "
 "installation % FIXME: <xref linkend=\"packages\"/>"
 msgstr ""
 
@@ -643,7 +648,7 @@ msgstr ""
 #: en/other_faq.ssi:234
 msgid ""
 "Q: How do I get past boot prompt without a working keyboard? A: See "
-"Customising the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
+"Customizing the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
 "Boot from an USB-HDD on an iMac with GRUB did not work."
 msgstr ""
 
diff --git a/manual/po/de/other_reporting-bugs.ssi.po b/manual/po/de/other_reporting-bugs.ssi.po
deleted file mode 100644
index e6afe93..0000000
--- a/manual/po/de/other_reporting-bugs.ssi.po
+++ /dev/null
@@ -1,369 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:2
-msgid "B~ Reporting bugs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:4
-msgid "1~ Reporting bugs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:6
-msgid ""
-"Debian Live is far from being perfect, but we want to make it as close as "
-"possible to perfect - with your help. Do not hesitate to report a bug: it is "
-"better to fill a report twice than never. However, this chapter includes "
-"recommendations how to file good bug reports."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:8
-msgid "For the impatient:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:10
-msgid ""
-"_* Always check first the image status updates on our homepage at http://"
-"live.debian.net/ for known issues."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:12
-msgid ""
-"_* Always try to reproduce the bug with the *{most recent version}* of live-"
-"helper and live-initramfs before submitting a bug report."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:14
-msgid ""
-"_* Try to give *{as specific information as possible}* about the bug. This "
-"includes (at least) the version of live-helper and live-initramfs used and "
-"the distribution of the live system you are building."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:16
-msgid "2~ Known issues"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:18
-msgid ""
-"Due to the nature of Debian testing and Debian unstable branches being a "
-"moving target, building a live system may not always be possible."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:20
-msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-helper does always default to the current stable "
-"release."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:22
-msgid ""
-"Currently known issues are listed under the section 'status' on our homepage "
-"at http://live.debian.net/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:24
-msgid ""
-"It is out of the scope of this manual to train you in correctly identifying "
-"and fixing problems in packages of the development branches, however, there "
-"are two things you can always try: When not succeeding to build testing, try "
-"if unstable works. If unstable does not work either, revert to testing and "
-"pinning the newer version of the failing package from unstable."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:26
-msgid "2~ Rebuild from scratch"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:28
-msgid ""
-"To ensure that a particular bug is not caused by an unclean built system, "
-"please always rebuild the whole live system from scratch to see if the bug "
-"is reproducible."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:30
-msgid "2~ Use up-to-date packages"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:32
-msgid ""
-"Using outdated packages can cause significant problems when trying to "
-"reproduce (and ultimately fix) your problem. If a relevant package is not "
-"available in Debian anymore, please recognize that the resources of the "
-"Debian kernel team are limited and will be unlikely to be able to fix the "
-"problem."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:34
-msgid "2~ Collect information"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:36
-msgid ""
-"Please provide enough information with your report. At a minimum, it should "
-"contain the exact version of live-helper version where the bug is "
-"encountered, and steps to reproduce it. Please use common sense and include "
-"other relevant information if you think that it might help in solving the "
-"problem."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:38
-msgid ""
-"To make the most out of your bug report, we require at least the following "
-"information:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:40
-msgid "_* Architecture of the host system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:42
-msgid "_* Version of live-helper on the host system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:44
-msgid "_* Version of live-initramfs on the live system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:46
-msgid "_* Version of debootstrap and/or cdebootstrap on the host system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:48
-msgid "_* Architecture of the live system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:50
-msgid "_* Distribution of the live system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:52
-msgid "_* Version of the kernel on the live system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:54
-msgid "You can generate a log of the build process by using the tee command:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:60
-msgid "% code{ % % lh_build 2>&1 | tee buildlog.txt % % }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:62
-msgid ""
-"Additionally, to rule out other errors, it is always a good idea to tar up "
-"your config directory and upload it somewhere (do *{not}* send it as an "
-"attachment to the mailinglist), so that we can try to reproduce the errors "
-"you encountered."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:64
-msgid ""
-"Remember to send in any logs that were produced with English locale "
-"settings, e.g. run your live-helper commands with a leading #{LC_ALL=C}# or #"
-"{LC_ALL=en_US}#."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:66
-msgid "2~ Use the correct package to report the bug against"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:68
-msgid "Where does the bug appear?"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:70
-msgid "3~ At build time whilst bootstrapping"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:72
-msgid ""
-"live-helper first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
-"distribution it is bootstrapping, it may fail. If a bug appears here, check "
-"if the error is related to a specific Debian package (most likely), or if it "
-"is related to cdebootstrap itself."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:74
-msgid ""
-"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
-"which we can not fix this directly. Please report such a bug against #"
-"{debootstrap}#, #{cdebootstrap}# or the failing package."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:76
-msgid "3~ At build time whilst installing packages"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:78
-msgid ""
-"live-helper installs additional packages from the Debian archive and "
-"depending on the Debian distribution used and the daily archive state, it "
-"can fail. If a bug appears here, check if the error is also reproducible on "
-"a normal system."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:80
-msgid ""
-"If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running debootstrap "
-"seperately from the Live system build or running lh_bootstrap with #{--debug}"
-"# will give you more information."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:82
-msgid ""
-"Also, if you are using a local mirror and/or any of sort of proxy and you "
-"are experiencing a problem, please always reproduce it first by "
-"bootstrapping from an official mirror."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:84
-msgid "3~ At boot-time"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:87
-msgid ""
-"If your image does not boot, please report it to the mailing list together "
-"with the information requested in collect-information. Do not forget to "
-"mention, how/when the image failed, in Qemu, VMWare or real hardware. If you "
-"are using a virtualization technology of any kind, please always run it on "
-"real hardware before reporting a bug. Providing a screenshot of the failure "
-"is also very helpful.  % FIXME: <xref linkend=\"collect-information\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:89
-msgid "3~ At run-time"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:91
-msgid ""
-"If a package was successfully installed, but fails while actually running "
-"the Live system, this is probably a bug in Debian Live. However,"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:93
-msgid "2~ Do the research"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:95
-msgid ""
-"Before filing the bug, please search the web for the particular error "
-"message or symptom you are getting. As it is highly unlikely that you are "
-"the only person experiencing a particular problem, there is always a chance "
-"that it has been discussed elsewhere, and a possible solution, patch, or "
-"workaround has been proposed."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:97
-msgid ""
-"You should pay particular attention to the Debian Live mailing list, as well "
-"as the homepage, as these are likely to contain the most up-to-date "
-"information. If such information exists, always include the references to it "
-"in your bug report."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:99
-msgid ""
-"In addition, you should check the current bug list for live-helper and the "
-"current bug list for live-initramfs at to see whether something similar has "
-"been reported already."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:101
-msgid "2~ Where to report bugs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:103
-msgid ""
-"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
-"System (BTS). For information on how to use the system, please see http://"
-"bugs.debian.org/. You can also submit the bugs by using the #{reportbug}# "
-"command from the package with the same name."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:105
-msgid ""
-"In general, you should report build time errors against the live-helper "
-"package and run time errors against live-initramfs. If you are unsure of "
-"which package is appropriate or need more help before submitting a bug "
-"report, please send a message to the mailing list and we will help you to "
-"figure it out."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:106
-msgid ""
-"Please note that bugs found in distributions derived from Debian (such as "
-"Ubuntu, Knoppix, Xandros, etc.) should *{not}* be reported to the Debian BTS "
-"unless they can be also reproduced on a Debian system using official Debian "
-"packages."
-msgstr ""
diff --git a/manual/po/de/project_bugs.ssi.po b/manual/po/de/project_bugs.ssi.po
new file mode 100644
index 0000000..fd45b7a
--- /dev/null
+++ b/manual/po/de/project_bugs.ssi.po
@@ -0,0 +1,491 @@
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"PO-Revision-Date: 2010-10-25 23:27+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/project_bugs.ssi:58 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:224 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:38
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
+#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
+#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
+#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
+#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:2
+msgid "B~ Reporting bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:4
+msgid "1~bugs Reporting bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:6
+msgid ""
+"Debian Live is far from being perfect, but we want to make it as close as "
+"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"better to fill a report twice than never. However, this chapter includes "
+"recommendations how to file good bug reports."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:8
+msgid "For the impatient:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:10
+msgid ""
+"_* Always check first the image status updates on our homepage at http://"
+"live.debian.net/ for known issues."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:12
+msgid ""
+"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
+"build, live-boot, and live-config before submitting a bug report."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:14
+msgid ""
+"_* Try to give *{as specific information as possible}* about the bug. This "
+"includes (at least) the version of live-build, live-boot, and live-config "
+"used and the distribution of the live system you are building."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:16
+msgid "2~ Known issues"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:18
+msgid ""
+"Due to the nature of Debian testing and Debian unstable distributions being "
+"a moving target, building a live system may not always be possible."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:20
+msgid ""
+"If this is a problem, do not build a system based on testing or unstable, "
+"but go with stable. live-build does always default to the current stable "
+"release."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:22
+msgid ""
+"Currently known issues are listed under the section 'status' on our homepage "
+"at http://live.debian.net/"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:24
+msgid ""
+"It is out of the scope of this manual to train you in correctly identifying "
+"and fixing problems in packages of the development distributions, however, "
+"there are two things you can always try: When not succeeding to build "
+"testing, try if unstable works. If unstable does not work either, revert to "
+"testing and pinning the newer version of the failing package from unstable."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:26
+msgid "2~ Rebuild from scratch"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:28
+msgid ""
+"To ensure that a particular bug is not caused by an unclean built system, "
+"please always rebuild the whole live system from scratch to see if the bug "
+"is reproducible."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:30
+msgid "2~ Use up-to-date packages"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:32
+msgid ""
+"Using outdated packages can cause significant problems when trying to "
+"reproduce (and ultimately fix) your problem."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:34
+msgid "2~collect-information Collect information"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:36
+msgid ""
+"Please provide enough information with your report. At a minimum, it should "
+"contain the exact version of live-build version where the bug is "
+"encountered, and steps to reproduce it. Please use common sense and include "
+"other relevant information if you think that it might help in solving the "
+"problem."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:38
+msgid ""
+"To make the most out of your bug report, we require at least the following "
+"information:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:40
+msgid "_* Architecture of the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:42
+msgid "_* Version of live-build on the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:44
+msgid "_* Version of live-boot on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:46
+msgid "_* Version of live-config on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:48
+msgid "_* Version of debootstrap and/or cdebootstrap on the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:50
+msgid "_* Architecture of the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
+msgid "_* Distribution of the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:54
+msgid "_* Version of the kernel on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:56
+msgid "You can generate a log of the build process by using the tee command:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:60
+msgid "lb build 2>&1 | tee build.log"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:64
+msgid ""
+"Additionally, to rule out other errors, it is always a good idea to tar up "
+"your config directory and upload it somewhere (do *{not}* send it as an "
+"attachment to the mailinglist), so that we can try to reproduce the errors "
+"you encountered."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:66
+msgid ""
+"Remember to send in any logs that were produced with English locale "
+"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
+"{LC_ALL=en_US}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:68
+msgid "2~ Use the correct package to report the bug against"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:70
+msgid "Where does the bug appear?"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:72
+msgid "3~ At build time whilst bootstrapping"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:74
+msgid ""
+"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
+"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"distribution it is bootstrapping, it may fail. If a bug appears here, check "
+"if the error is related to a specific Debian package (most likely), or if it "
+"is related to bootstrapping tool itself."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:76
+msgid ""
+"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
+"which we can not fix this directly. Please report such a bug against the "
+"bootstrapping tool or the failing package."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:78
+msgid "3~ At build time whilst installing packages"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:80
+msgid ""
+"live-build installs additional packages from the Debian archive and "
+"depending on the Debian distribution used and the daily archive state, it "
+"can fail. If a bug appears here, check if the error is also reproducible on "
+"a normal system."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:82
+msgid ""
+"If this is the case, this is not a bug in Debian Live, but rather in Debian "
+"- please report it against the failing package. Running debootstrap "
+"seperately from the Live system build or running lb bootstrap with #{--debug}"
+"# will give you more information."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
+msgid ""
+"Also, if you are using a local mirror and/or any of sort of proxy and you "
+"are experiencing a problem, please always reproduce it first by "
+"bootstrapping from an official mirror."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:86
+msgid "3~ At boot-time"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:88
+msgid ""
+"If your image does not boot, please report it to the mailing list together "
+"with the information requested in {Collect information}#collect-information. "
+"Do not forget to mention, how/when the image failed, in Qemu, VMWare or real "
+"hardware. If you are using a virtualization technology of any kind, please "
+"always run it on real hardware before reporting a bug. Providing a "
+"screenshot of the failure is also very helpful."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:90
+msgid "3~ At run-time"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:92
+msgid ""
+"If a package was successfully installed, but fails while actually running "
+"the Live system, this is probably a bug in Debian Live. However,"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:94
+msgid "2~ Do the research"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:96
+msgid ""
+"Before filing the bug, please search the web for the particular error "
+"message or symptom you are getting. As it is highly unlikely that you are "
+"the only person experiencing a particular problem, there is always a chance "
+"that it has been discussed elsewhere, and a possible solution, patch, or "
+"workaround has been proposed."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:98
+msgid ""
+"You should pay particular attention to the Debian Live mailing list, as well "
+"as the homepage, as these are likely to contain the most up-to-date "
+"information. If such information exists, always include the references to it "
+"in your bug report."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:100
+msgid ""
+"In addition, you should check the current bug lists for live-build, live-"
+"boot, and live-config to see whether something similar has been reported "
+"already."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:102
+msgid "2~ Where to report bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:104
+msgid ""
+"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
+"System (BTS). For information on how to use the system, please see http://"
+"bugs.debian.org/. You can also submit the bugs by using the #{reportbug}# "
+"command from the package with the same name."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:106
+msgid ""
+"In general, you should report build time errors against the live-build "
+"package, boot time errors against live-boot, and run time errors against "
+"live-config. If you are unsure of which package is appropriate or need more "
+"help before submitting a bug report, please send a message to the mailing "
+"list and we will help you to figure it out."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:107
+msgid ""
+"Please note that bugs found in distributions derived from Debian (such as "
+"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
+"can be also reproduced on a Debian system using official Debian packages."
+msgstr ""
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index e8d344f..14ec30b 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,30 +101,38 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
@@ -159,17 +164,11 @@ msgid ""
 "A live system usually means an operating system booted on a computer from a "
 "removable medium (such as CD-ROM, USB stick, or network), ready to use "
 "without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see terms)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
+"done at runtime (see {Terms}#terms )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:14
+#: en/user_basics.ssi:12
 msgid ""
 "With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
 "the supported architectures (currently amd64, i386, powerpc and sparc). It "
@@ -177,17 +176,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:16
+#: en/user_basics.ssi:14
 msgid "_* Linux kernel"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:18
+#: en/user_basics.ssi:16
 msgid "_* The Linux image, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
 msgid ""
 "_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
 "containing modules possibly needed to mount the filesystem's image and some "
@@ -195,10 +194,10 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
 msgid ""
-"_* *{System image}*: The operating systems filesystem image. Debian Live "
-"uses SquashFS, a compressed filesystem, to minimize its image size. Note "
+"_* *{System image}*: The operating systems filesystem image. The SquashFS "
+"compressed filesystem is used to minimize the Debian Live image size. Note "
 "that it's read-only. So, during boot the Debian Live system will use a RAM "
 "disk and 'union' mechanism to enable writing files within the running "
 "system. However, all modifications will be lost upon shutdown unless "
@@ -206,12 +205,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid "% FIXME: <xref linkend=\"persistence\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid ""
 "_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -225,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "_* live-build will build the system image from your specifications, setup a "
 "Linux kernel and its initrd, a bootloader to run them, all in one media-"
@@ -233,12 +232,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
 msgid ""
 "The following sequence of commands, provided by live-build, will create a "
 "basic ISO image containing just the Debian standard system without X.org. It "
@@ -246,129 +245,135 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
 msgid ""
 "By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see lb-config)."
+"the defaults (see {The lb config command}#lb-config )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:46
+#: en/user_basics.ssi:42
 msgid ""
 "Now that we have a \"config/\" hierarchy, we may build the image with the lb "
 "build command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50 en/user_basics.ssi:122 en/user_basics.ssi:204
+#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:50
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see lb-build)."
+"connection (see {The lb build command}#lb-build )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:52
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:54
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64 en/user_basics.ssi:144
+#: en/user_basics.ssi:58 en/user_basics.ssi:146
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:60
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:64
 msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:66
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:70
 msgid "# apt-get install virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:74
 msgid ""
 "and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
 "build the required kernel modules to run virtualbox-ose."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:82
+#: en/user_basics.ssi:76
 msgid ""
 "After successful installation, virtualbox can be e.g. found in the GNOME "
 "menu under 'Applications/System Tools/VirtualBox OSE'."
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:78
+msgid ""
+"Please consider including of following packages onto the live image to "
+"achieve higher resolution of the display when booting the live image in "
+"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
+"default resolution of the virtualbox-ose display shouldn't work with the gui-"
+"installer)."
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:84
+msgid ""
+"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:88
 msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:90
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:94
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:96
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:100
 msgid "2~ Building an USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:102
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -377,46 +382,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:104
 msgid ""
 "Note if you created an iso image with the previous example, you will need to "
-"clean up your working directory with the #{lb clean} command (see lb-clean):"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:102
-msgid "% FIXME: <xref linkend=\"lb-clean\"/>"
+"clean up your working directory with the #{lb clean} command (see {The lb "
+"clean command}#lb-clean ):"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:106 en/user_basics.ssi:186
+#: en/user_basics.ssi:108 en/user_basics.ssi:188
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:112
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:114
+#: en/user_basics.ssi:116
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:118
+#: en/user_basics.ssi:120
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:128
 msgid "3~ Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:130
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on an USB stick. Plug in an USB "
@@ -424,12 +425,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:132
+#: en/user_basics.ssi:134
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:138
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -437,28 +438,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:140
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:142
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:148
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:154
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -467,45 +468,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:158
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:162
 msgid ""
 "Ater the creation of the partition you have to create a filsystem on it. One "
 "possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
+#: en/user_basics.ssi:166
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:170
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
+#: en/user_basics.ssi:174
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:178
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -513,28 +514,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:184
 msgid ""
 "Note if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:192
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
+#: en/user_basics.ssi:196
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
 msgid ""
 "In contrast with the ISO and USB hdd images, netbooting does not support "
 "serving a filesystem image with the client so the files must be served via "
@@ -544,12 +545,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:202
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
 msgid ""
 "In a network boot the client runs a small piece of software, which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -560,7 +561,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
@@ -569,17 +570,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the computer netbooting, and to advertise the location of the PXE "
@@ -587,25 +588,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:220
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
 "dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:226
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:229
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -613,7 +614,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:232
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -621,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -631,7 +632,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:241
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -640,7 +641,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:244
 #, no-wrap
 msgid ""
 "    # PXE boot loader (first program to be loaded, by TFTP)\n"
@@ -648,7 +649,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:247
 #, no-wrap
 msgid ""
 "  }\n"
@@ -656,17 +657,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
 msgid "This serves the kernel and initial ramdisk to the system at run-time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:255
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
 "inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -674,27 +675,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
-msgid "dpkg-reconfigure -plow tftpd-hpa"
-msgstr ""
-
-#. type: Plain text
 #: en/user_basics.ssi:259
-msgid "code}"
+msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -702,35 +698,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:271
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:275
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:279
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:283
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -739,40 +735,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:291
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:299
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:310
 msgid ""
 "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
 "\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -781,62 +777,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:324
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:332
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:338
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:341
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:344
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:349
 msgid ""
 "ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
 "83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -844,19 +840,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:355
 msgid ""
 "_* Double click on this file (or run VMWare player and selecet this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:356
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index be9ddad..66e39e1 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,52 +101,54 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:2
-msgid "B~ Customising contents"
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid "B~ Customizing contents"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:4
-msgid "1~ Customising contents"
+msgid "1~customizing-contents Customizing contents"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:6
-msgid "This chapter discusses further customisation of the live system."
+msgid "This chapter discusses further customization of the live system."
 msgstr ""
 
 #. type: Plain text
@@ -210,6 +209,11 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+#: en/user_customization-contents.ssi:26
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-contents.ssi:28
 msgid "3~ Live/chroot local includes"
 msgstr ""
diff --git a/manual/po/de/user_customization-internationalization.ssi.po b/manual/po/de/user_customization-internationalization.ssi.po
new file mode 100644
index 0000000..3f736c9
--- /dev/null
+++ b/manual/po/de/user_customization-internationalization.ssi.po
@@ -0,0 +1,218 @@
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"PO-Revision-Date: 2010-10-03 21:43+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:2
+msgid "B~ Customizing locale and language"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:4
+msgid "1~customizing-locale-and-language Customizing locale and language"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:6
+msgid "2~ Default locale and keyboard"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:8
+msgid ""
+"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
+"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:12
+msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:16
+msgid "The entry for a Swiss-German keyboard would be:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:20
+msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:24
+msgid "Combined, the keyboard and locale configured for Switzerland would be:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:28
+msgid ""
+"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:32
+msgid ""
+"Note: You can find a list of options in the manpage for live-config. "
+"Currently, only UTF-8 locales are supported."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:34
+msgid "2~ l10n Packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:36
+msgid ""
+"An experimental feature of live-build is to automatically check for each "
+"package for which it is know that there are -l10n packages available and "
+"install them. To add German packages the entry would be"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:40
+msgid "$ lb config --language \"de\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:43
+msgid ""
+"This will also change the default syslinux language if translations are "
+"available or local translations have been put into #{config/templates/"
+"syslinux/de}#."
+msgstr ""
diff --git a/manual/po/de/user_customization-overview.ssi.po b/manual/po/de/user_customization-overview.ssi.po
new file mode 100644
index 0000000..7915ea3
--- /dev/null
+++ b/manual/po/de/user_customization-overview.ssi.po
@@ -0,0 +1,44 @@
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"PO-Revision-Date: 2010-10-22 07:52-0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid "B~ Customizing contents"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:4
+msgid "1~customization-overview Customization overview"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:7
+msgid ""
+"% FIXME: just a stub for now.  In conversational style, cover the different "
+"kinds of customization % and link to each section within the text."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:9
+msgid ""
+"This chapter gives an overview of the various ways in which your Debian live "
+"systems may be customized. See sections {Customizing package installation}"
+"#customizing-package-installation, {Customizing contents}#customizing-"
+"contents and {Customizing locale and language}#customizing-locale-and-"
+"language."
+msgstr ""
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index e2d0159..f303056 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 08:58-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,45 +102,53 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+#: en/user_basics.ssi:230 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:2
-msgid ":B~ Customising package installation"
+msgid ":B~ Customizing package installation"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:4
-msgid "1~ Customising package installation"
+msgid "1~customizing-package-installation Customizing package installation"
 msgstr ""
 
 #. type: Plain text
@@ -461,16 +466,39 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:145
 #, no-wrap
+msgid "*{Local binary packages lists}*\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:147
+msgid ""
+"In case you want to include some required .deb packages to live media's "
+"pool/ (without installing them onto the live image) you may need to use "
+"lists using binary local package lists stored in #{config/binary_local-"
+"packageslists}#. Such media can be used as a customized debian install image "
+"for offline installations."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:149
+msgid ""
+"Package lists that exist in this directory need to have a .list suffix in "
+"order to be processed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:151
+#, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:160
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:162
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -478,75 +506,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:164
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:170
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:174
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:180
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:184
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:190
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:194
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:200
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:198
+#: en/user_customization-packages.ssi:204
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
 "in this way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:200
+#: en/user_customization-packages.ssi:206
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:202
+#: en/user_customization-packages.ssi:208
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:210
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:212
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:214
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -557,7 +585,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:216
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -568,35 +596,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:218
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:220
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:222
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:224
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
-"\" customisations but has a number of drawbacks, whilst using a custom APT "
+"\" customizations but has a number of drawbacks, whilst using a custom APT "
 "repository is more time-consuming to set up."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:226
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:228
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -605,45 +633,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:230
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:232
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:234
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:236
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:238
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:240
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:242
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -651,12 +679,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:244
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:246
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -664,12 +692,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:248
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:250
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -679,7 +707,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:252
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -689,17 +717,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:254
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:256
 msgid "3~ Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:257
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index 5e0e898..4d06253 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,46 +101,42 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/other_customization-internationalization.ssi:32
-#: en/user_installation.ssi:44
-msgid "or"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
 #: en/user_installation.ssi:2
 msgid ":B~ Installation"
 msgstr ""
@@ -243,6 +236,11 @@ msgid "# apt-get install live-build"
 msgstr ""
 
 #. type: Plain text
+#: en/user_installation.ssi:44
+msgid "or"
+msgstr ""
+
+#. type: Plain text
 #: en/user_installation.ssi:48
 msgid "# aptitude install live-build"
 msgstr ""
@@ -296,17 +294,17 @@ msgid "and uninstall it with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:87
-msgid "# make uninstall }code"
+#: en/user_installation.ssi:86
+msgid "# make uninstall"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:89
+#: en/user_installation.ssi:90
 msgid "3~ From 'snapshots'"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:91
+#: en/user_installation.ssi:92
 msgid ""
 "If you do not wish to build or install live-build from source, you can use "
 "snapshots. These are built automatically from the latest version in Git and "
@@ -314,45 +312,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:93
+#: en/user_installation.ssi:94
 msgid "2~ live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:95
+#: en/user_installation.ssi:96
 #, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customised Debian Live systems. However, doing so will do no harm.\n"
+msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:97
-msgid "3~ Using a customised live-boot"
+#: en/user_installation.ssi:98
+msgid "3~ Using a customized live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:99
+#: en/user_installation.ssi:100
 msgid ""
 "To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in terms."
+"familiar with the terms mentioned in {Terms}#terms ."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:103
+#: en/user_installation.ssi:102
 msgid "_* Checkout the live-boot source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:107
+#: en/user_installation.ssi:106
 msgid "$ git clone git://live.debian.net/git/live-boot.git"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:111
+#: en/user_installation.ssi:110
 msgid "_* Make changes to your local copy"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:113
+#: en/user_installation.ssi:112
 msgid ""
 "And beware that if you want to add your pre-init script in live-bottom, you "
 "should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -360,33 +358,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:115
+#: en/user_installation.ssi:114
 msgid "_* Build a live-boot .deb"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:117
+#: en/user_installation.ssi:116
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is squeeze then you should "
-"build against squeeze. You can use a personal builder such as /{pbuilder}/ "
+"your target platform: this means if your target is Squeeze then you should "
+"build against Squeeze. You can use a personal builder such as /{pbuilder}/ "
 "or /{sbuild}/ to automate building packages in chroot. To build directly on "
 "the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ "
 "package):"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:121
 msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:126
+#: en/user_installation.ssi:125
 msgid "_* Use the generated live-boot .deb"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:128
+#: en/user_installation.ssi:127
 msgid ""
 "As live-boot is installed by live-build system, installing the package in "
 "the host system is not sufficient: you should treat the generated .deb like "
@@ -395,19 +393,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:130
+#: en/user_installation.ssi:129
 msgid ""
 "% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
 "apt\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:132
+#: en/user_installation.ssi:131
 msgid "3~ Using live-boot snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:134
+#: en/user_installation.ssi:133
 msgid ""
 "You can let live-build automatically use the latest snapshot of live-boot by "
 "configuring a third-party repository in your live-build configuration "
@@ -416,6 +414,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:138
+#: en/user_installation.ssi:137
 msgid "lb config --repository live.debian.net"
 msgstr ""
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
new file mode 100644
index 0000000..5b045c7
--- /dev/null
+++ b/manual/po/de/user_managing_a_configuration.ssi.po
@@ -0,0 +1,268 @@
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-13 17:00+0300\n"
+"PO-Revision-Date: 2010-10-13 17:00+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:88 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:2
+msgid ":B~ Managing a configuration"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:4
+msgid "1~ Managing a configuration"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:6
+msgid ""
+"This chapter explains how to manage a live configuration from initial "
+"creation, through successive revisions and successive releases of both the "
+"live-build software and the live image itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:8
+msgid "2~ Use auto to manage configuration changes"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:10
+msgid ""
+"Live configurations rarely are perfect on the first try. You'll likely need "
+"to make a series of revisions until you are satisfied. However, "
+"inconsistencies can creep into your configuration from one revision to the "
+"next if you aren't careful. The main problem is, once a variable is given a "
+"default value, that value will not be recomputed from other variables that "
+"may change in later revisions."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:12
+msgid ""
+"For example, when the distribution is first set, many 'dependent' variables "
+"are given default values that suit that distribution. However, if you later "
+"decide to change the distribution, those dependent variables continue to "
+"retain old values that are no longer appropriate."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:14
+msgid ""
+"A second, related problem is that if you run #{lb config}# and then upgrade "
+"to a new version of live-build that has changed one of the variable names, "
+"you will discover this only by manual review of the variables in your config "
+"files, which you will then need to use to set the appropriate option again."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:16
+msgid ""
+"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
+"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
+"that are designed to help you manage your configuration. Simply create an "
+"auto/config script containing #{lb config}# command with all desired "
+"options, and an auto/clean that removes the files containing configuration "
+"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"files will be executed. This will ensure that your configuration is kept "
+"internally consistent from one revision to the next and from one live-build "
+"release to the next (though you will still have to take care and read the "
+"documentation when you upgrade live-build and make adjustments as needed)."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:18
+msgid "2~ Example auto scripts"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:20
+msgid ""
+"Use the following auto script examples as the starting point for your new "
+"live-build configuration. Take note that when you call the #{lb}# command "
+"that the auto script wraps, you must specify #{noauto}# as its parameter to "
+"ensure that the auto script isn't called again, recursively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:22
+msgid "auto/config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:29
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"lb config noauto \\\n"
+"\t--architecture i386 \\\n"
+"\t${@}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:33
+msgid "auto/clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:41
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"lb clean noauto ${@}\n"
+"rm -f config/binary config/bootstrap \\\n"
+"\tconfig/chroot config/common config/source\n"
+"rm -f binary.log\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:45
+msgid "auto/build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:50
+msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:54
+msgid ""
+"Edit auto/config, changing or adding any options as you see fit. In the "
+"example above, --architecture is set to i386 so that when the image is built "
+"on an amd64 system, it will not default to building amd64 images. Change "
+"this to an appropriate value for your image (or delete it if you want to use "
+"the default) and add any additional options in continuation lines that "
+"follow."
+msgstr ""
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index d8c8b3c..e2914a1 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,43 +102,41 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
-
-#. type: Plain text
 #: en/user_overview.ssi:2
 msgid ":B~ Overview of tools"
 msgstr ""
@@ -154,13 +149,13 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:6
 msgid ""
-"This chapter contains an overview of the two main tools used in building "
-"Debian Live systems."
+"This chapter contains an overview of the three main tools used in building "
+"Debian Live systems: live-build, live-boot and live-config."
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~ live-build"
+msgid "2~live-build live-build"
 msgstr ""
 
 #. type: Plain text
@@ -209,11 +204,11 @@ msgid ""
 "Unlike debhelper, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
 "similar to tools such as #{dh-make}#. For more information about #{lb config}"
-"#, please see lb-config."
+"#, please see {The lb config command}#lb-config."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:24
+#: en/user_overview.ssi:22
 msgid ""
 "Besides the common config/common, which is used by all live-build commands, "
 "some additional files can be used to configure the behavior of specific "
@@ -223,7 +218,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:26
+#: en/user_overview.ssi:24
 msgid ""
 "For example, the #{lb_bootstrap_debootstrap}# command uses files named "
 "config/bootstrap and config/bootstrap_debootstrap to read the options it "
@@ -233,7 +228,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:28
+#: en/user_overview.ssi:26
 msgid ""
 "live-build respects environment variables which are present in the context "
 "of the shell it is running. If variables can be read from config files, then "
@@ -244,7 +239,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:30
+#: en/user_overview.ssi:28
 msgid ""
 "All config files are shell scripts which are sourced by a live-build "
 "command. That means they have to follow the normal shell syntax. You can "
@@ -252,7 +247,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:32
+#: en/user_overview.ssi:30
 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."
@@ -264,87 +259,68 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:34
-msgid "Please see installation for information on how to install live-build."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:36
-msgid "% FIXME: <xref linkend=\"installation\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:38
+#: en/user_overview.ssi:32
 msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:34
 msgid ""
-"_* *{lb config}*: Responsible for initialising a Live system configuration "
-"directory. See lb-config for more information."
+"_* *{lb config}*: Responsible for initializing a Live system configuration "
+"directory. See {The lb config command}#lb-config for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:36
 msgid ""
-"_* *{lb build}*: Responsible for starting a Live system build. See lb-build "
-"for more information."
+"_* *{lb build}*: Responsible for starting a Live system build. See {The lb "
+"build command}#lb-build for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:48
+#: en/user_overview.ssi:38
 msgid ""
 "_* *{lb clean}*: Responsible for removing parts of a Live system build. See "
-"lb-clean for more information."
+"{The lb clean command}#lb-clean for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:50
-msgid "% FIXME: <xref linkend=\"lb-clean\"/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:52
-msgid "3~ The #{lb config}# command"
+#: en/user_overview.ssi:40
+msgid "3~lb-config The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:42
 msgid ""
-"As discussed in live-build, the scripts that make up live-build source their "
-"configuration from a single directory named config/. As constructing this "
-"directory by hand would be time-consuming and error-prone, the #{lb config}# "
-"command can be used to create skeleton configuration folders."
+"As discussed in {live-build}#live-build, the scripts that make up live-build "
+"source their configuration from a single directory named config/. As "
+"constructing this directory by hand would be time-consuming and error-prone, "
+"the #{lb config}# command can be used to create skeleton configuration "
+"folders."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:56
-msgid "% FIXME: <xref linkend=\"live-build\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:58
+#: en/user_overview.ssi:44
 msgid ""
 "Issuing #{lb config}# without any arguments creates a config subdirectory "
 "which it populates with some default settings:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:63
+#: en/user_overview.ssi:49
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:68
+#: en/user_overview.ssi:54
 msgid ""
 "$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22 "
 "user user 4096 Sep 7 13:02 config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:82
 msgid ""
 "$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary "
 "drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2 "
@@ -369,7 +345,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:86
 msgid ""
 "Using #{lb config}# without any arguments would be suitable for users who "
 "are either happy editing the generated files, or are simply happy with the "
@@ -377,7 +353,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:88
 msgid ""
 "You can ask #{lb config}# to generate a config/ directory \"preseeded\" with "
 "various options. This might be suitable if you do not require the default "
@@ -385,38 +361,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:92
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:96
 msgid ""
 "will build a config/ directory configured to include the 'gnome' package "
 "list. It is possible to specify many options:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:114
+#: en/user_overview.ssi:100
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
+#: en/user_overview.ssi:104
 msgid ""
 "A full list of options is available in the #{lb_config}# man page. Most "
 "options have a parallel with an \"LB_\" prefixed variable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
-msgid "3~ The #{lb build}# command"
+#: en/user_overview.ssi:106
+msgid "3~lb-build The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:122
+#: en/user_overview.ssi:108
 msgid ""
 "The #{lb build}# command reads in your configuration from the config/ "
 "directory. It then runs the lower lower level commands needed to build your "
@@ -424,24 +400,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
-msgid "3~ The #{lb clean}# command"
+#: en/user_overview.ssi:110
+msgid "3~lb-clean The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:126
+#: en/user_overview.ssi:112
 msgid ""
 "It is the job of the #{lb clean}# command to remove various parts of a build "
 "so subsequent builds can start from a clean state."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:128
-msgid "2~ The live-boot package"
+#: en/user_overview.ssi:114
+msgid "2~live-boot The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:130
+#: en/user_overview.ssi:116
 msgid ""
 "live-boot is a collection of scripts providing hooks for the initramfs-"
 "tools, used to generate an initramfs capable of booting live systems, such "
@@ -450,7 +426,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:132
+#: en/user_overview.ssi:118
 msgid ""
 "At boot time it will look for read-only media containing a \"/live\" "
 "directory where a root filesystem (often a compressed filesystem image like "
@@ -459,9 +435,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:133
+#: en/user_overview.ssi:120
 msgid ""
 "More information on initial ramfs in Debian can be found in the Debian Linux "
 "Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
 "on initramfs."
 msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:122
+msgid "2~live-config The live-config package"
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:124
+msgid ""
+"live-config consists of the scripts that run at boot time after live-boot to "
+"configure the live system automatically. It handles such tasks as setting "
+"the hostname, locales and timezone, creating the live user, inhibiting cron "
+"jobs and performing autologin of the live user."
+msgstr ""
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
new file mode 100644
index 0000000..ebdc63f
--- /dev/null
+++ b/manual/po/fr/about_manual.ssi.po
@@ -0,0 +1,607 @@
+# French translations for live-manual package
+# 2010 Christophe Siraut <chris at tobald.eu.org>
+# This file is distributed under the same license as the live-config package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0~a8\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-21 19:15+0100\n"
+"Last-Translator: Christophe Siraut <chris at tobald.eu.org>\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:2
+msgid ":B~ About this manual"
+msgstr ":B~ À propos de ce manuel"
+
+#. type: Plain text
+#: en/about_manual.ssi:4
+msgid "1~ About this manual"
+msgstr "1~ À propos de ce manuel"
+
+#. type: Plain text
+#: en/about_manual.ssi:6
+msgid ""
+"The main goal of this manual is to serve as a single access point to all "
+"documentation related to the Debian Live project. It does not include end-"
+"user documentation for using a Debian Live system as far as things are live "
+"specific."
+msgstr ""
+"Le but principal de ce manuel est de servir de point d'accès centralisé pour "
+"toute la documentation liée au projet Debian Live. Il ne contient pas de "
+"documentation utilisateur pour utiliser un système Debian Live tant que "
+"celle-ci n'est pas spécifique au projet Live."
+
+#. type: Plain text
+#: en/about_manual.ssi:8
+msgid ""
+"Some of the commands mentioned in the text must be executed with superuser "
+"privileges which can be obtained by becoming the root user via #{su}# or by "
+"using #{sudo}#. To distinguish between commands which may be executed by an "
+"unprivileged user and those requiring superuser privileges, commands are "
+"prepended by #{$}# or #{#}# respectively. This symbol is not a part of the "
+"command."
+msgstr ""
+"Certaines commandes mentionnées dans le texte doivent être exécutées avec "
+"les privilèges super-utilisateur, qui peuvent être obtenu en devenant root à "
+"l'aide de #{su}# ou en utilisant #{sudo}#. Afin de distinguer les commandes "
+"qui peuvent être exécutées par un utilisateur sans privilèges de celles "
+"nécessitant les privilèges super-utilisateur, les commandes sont précédées "
+"respectivement par #{$}# ou #{#}#. Ce symbole ne fait pas partie de la "
+"commande."
+
+#. type: Plain text
+#: en/about_manual.ssi:10
+msgid "2~terms Terms"
+msgstr "2~terms Terminologie"
+
+#. type: Plain text
+#: en/about_manual.ssi:12
+msgid ""
+"_* *{Live system}*: An operating system that can boot without installation "
+"to a hard drive. Live systems do not alter local operating system(s) or file"
+"(s) already installed on the computer hard drive unless instructed to do so. "
+"Live systems are typically booted from media such as CDs, DVDs or USB "
+"sticks. Some may also boot over the network."
+msgstr ""
+"_* *{Système Live}*: Un système d'exploitation pouvant être démarré sans "
+"installation préalable sur disque dur. Les Systèmes Live ne modifient pas le "
+"système d'exploitation local ou les fichiers installés sur le disque dur "
+"sans qu'on leur en donne explicitement l'instruction. D'habitude, les "
+"systèmes Live sont démarrés à partir de media tels que des CD, DVD, ou des "
+"clés USB. Certains peuvent également être démarrés depuis le réseau."
+
+#. type: Plain text
+#: en/about_manual.ssi:14
+msgid ""
+"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
+"live-build, live-config, and live-manual packages."
+msgstr ""
+"_* *{Debian Live}*: Le sous-projet Debian qui maintient les paquets live-"
+"boot, live-build, live-config, et live-manual."
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
+"_* *{Debian Live system}*: A live system that uses software from the Debian "
+"operating system that may be booted from CDs, DVDs, USB sticks, over the "
+"network (via netboot images), and over the Internet (via boot parameter #"
+"{fetch=URL}#)."
+msgstr ""
+"_* *{Système Debian Live}*: Un système live qui utilise les logiciels du "
+"système d'exploitation Debian et qui peut être lancé depuis CD, DVD, clé "
+"USB, en réseau (à l'aide des images netboot), et à partir d'Internet (à "
+"l'aide du paramètre de démarrage #{fetch=URL}#)."
+
+#. type: Plain text
+#: en/about_manual.ssi:18
+msgid "_* *{Host system}*: The environment used to create the live system."
+msgstr ""
+"_* *{Système hôte}*: L'environnement utilisé pour créer le système live."
+
+#. type: Plain text
+#: en/about_manual.ssi:20
+msgid "_* *{Target system}*: The environment used to run the live system."
+msgstr ""
+"_* *{Système de destination}*: L'environnement utilisé pour faire tourner le "
+"système live."
+
+#. type: Plain text
+#: en/about_manual.ssi:22
+msgid ""
+"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
+"boot was formerly a part of live-initramfs."
+msgstr ""
+"_* *{live-boot}*: Une collection de scripts utilisés pour lancer des "
+"systèmes live. live-boot faisait initialement partie de live-initramfs."
+
+#. type: Plain text
+#: en/about_manual.ssi:24
+msgid ""
+"_* *{live-build}*: A collection of scripts used to build customized Debian "
+"Live systems. live-build was formerly known as live-helper, and even earlier "
+"known as live-package."
+msgstr ""
+"_* *{live-build}*: Une collection de scripts utilisés pour personnaliser les "
+"systèmes Debian Live. live-build était initialement nommé live-package, puis "
+"live-helper."
+
+#. type: Plain text
+#: en/about_manual.ssi:26
+msgid ""
+"_* *{live-config}*: A collection of scripts used to configure a live system "
+"during the boot process. live-config was formerly a part of live-initramfs."
+msgstr ""
+"_* *{live-config}*: Une collection de scripts utilisés pour configurer un "
+"système live durant le processus de démarrage. live-config faisait "
+"initialement partie de live-initramfs."
+
+#. type: Plain text
+#: en/about_manual.ssi:28
+msgid ""
+"_* *{live-manual}*: This document is maintained in a package called live-"
+"manual."
+msgstr ""
+"_* *{live-manual}*: Ce document est maintenu dans un paquet nommé live-"
+"manual."
+
+#. type: Plain text
+#: en/about_manual.ssi:30
+msgid ""
+"_* *{Debian Installer (d-i)}*: The official installation system for the "
+"Debian distribution."
+msgstr ""
+"_* *{Debian Installer (d-i)}*: Le système d'installation officiel pour la "
+"distribution Debian."
+
+#. type: Plain text
+#: en/about_manual.ssi:32
+msgid ""
+"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
+"prompt to influence the kernel or live-config."
+msgstr ""
+"_* *{Paramètres de démarrage}*: Les paramètres pouvant être entrés à "
+"l'invite du bootloader afin de modifier le kernel ou live-config."
+
+#. type: Plain text
+#: en/about_manual.ssi:34
+msgid ""
+"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
+"instances of the GNU/Linux environment on a single system simultaneously "
+"without rebooting."
+msgstr ""
+"_* *{chroot}*: Le programme chroot, chroot(8), nous permet de faire tourner "
+"plusieurs instances concurrentes de l'environnement GNU/Linux sur un système "
+"sans redémarrage."
+
+#. type: Plain text
+#: en/about_manual.ssi:36
+msgid ""
+"_* *{Binary image}*: A file containing the live system, such as binary.iso "
+"or binary.img."
+msgstr ""
+"_* *{Image binaire}*: Un fichier contenant le système live, tel que binary."
+"iso ou binary.img."
+
+#. type: Plain text
+#: en/about_manual.ssi:38
+msgid ""
+"_* *{Target distribution}*: The distribution upon which your live system "
+"will be based. This can differ from the distribution of your host system."
+msgstr ""
+"_* *{Distribution de destination}*: La distribution sur laquelle votre "
+"système live sera basée. Ceci peut varier en fonction de la distribution de "
+"votre système hôte."
+
+#. type: Plain text
+#: en/about_manual.ssi:40
+msgid ""
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
+"contains the latest officially released distribution of Debian. The testing "
+"distribution is the staging area for the next stable release. A major "
+"advantage of using this distribution is that it has more recent versions of "
+"software relative to the stable release. The unstable distribution is where "
+"active development of Debian occurs. Generally, this distribution is run by "
+"developers and those who like to live on the edge."
+msgstr ""
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: La distribution stable "
+"contient la dernière version officielle de Debian. La distribution testing "
+"est la future version stable où seuls les paquets suffisamment matures "
+"peuvent entrer. Un avantage de cette distribution est qu'elle contient des "
+"logiciels de versions plus récentes que la version stable. La distribution "
+"unstable est en constante évolution. En général cette distribution est "
+"utilisée par les développeurs et ceux qui aiment le risque."
+
+#. type: Plain text
+#: en/about_manual.ssi:42
+msgid ""
+"At the time of writing, Squeeze is the current stable release and Wheezy is "
+"the current testing release. Sid will always be a synonym for the unstable "
+"release."
+msgstr ""
+"Au moment d'écrire ce document, Squeeze est la version Stable et Wheezy est "
+"la version testing. Sid restera toujours synonyme de version unstable."
+
+#. type: Plain text
+#: en/about_manual.ssi:44
+msgid "2~ Authors"
+msgstr "2~Auteurs"
+
+#. type: Plain text
+#: en/about_manual.ssi:46
+msgid "A list of authors (in alphabetical order):"
+msgstr "La liste des auteurs (dans l'ordre alphabétique):"
+
+#. type: Plain text
+#: en/about_manual.ssi:48
+msgid "_* Ben Armstrong"
+msgstr "_* Ben Armstrong"
+
+#. type: Plain text
+#: en/about_manual.ssi:50
+msgid "_* Brendan Sleight"
+msgstr "_* Brendan Sleight"
+
+#. type: Plain text
+#: en/about_manual.ssi:52
+msgid "_* Chris Lamb"
+msgstr "_* Chris Lamb"
+
+#. type: Plain text
+#: en/about_manual.ssi:54
+msgid "_* Daniel Baumann"
+msgstr "_* Daniel Baumann"
+
+#. type: Plain text
+#: en/about_manual.ssi:56
+msgid "_* Franklin Piat"
+msgstr "_* Franklin Piat"
+
+#. type: Plain text
+#: en/about_manual.ssi:58
+msgid "_* Jonas Stein"
+msgstr "_* Jonas Stein"
+
+#. type: Plain text
+#: en/about_manual.ssi:60
+msgid "_* Kai Hendry"
+msgstr "_* Kai Hendry"
+
+#. type: Plain text
+#: en/about_manual.ssi:62
+msgid "_* Marco Amadori"
+msgstr "_* Marco Amadori"
+
+#. type: Plain text
+#: en/about_manual.ssi:64
+msgid "_* Mathieu Geli"
+msgstr "_* Mathieu Geli"
+
+#. type: Plain text
+#: en/about_manual.ssi:66
+msgid "_* Matthias Kirschner"
+msgstr "_* Matthias Kirschner"
+
+#. type: Plain text
+#: en/about_manual.ssi:68
+msgid "_* Richard Nelson"
+msgstr "_* Richard Nelson"
+
+#. type: Plain text
+#: en/about_manual.ssi:70
+msgid "_* Trent W. Buck"
+msgstr "_* Trent W. Buck"
+
+#. type: Plain text
+#: en/about_manual.ssi:72
+msgid "2~ Contributing to this document"
+msgstr "2~ Contribuer à ce document"
+
+#. type: Plain text
+#: en/about_manual.ssi:74
+msgid ""
+"This manual is intended as a community project and all proposals for "
+"improvements and contributions are extremely welcome. The preferred way to "
+"submit a contribution is to send it to the mailing list. Please see {Contact}"
+"#contact for more information."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:76
+msgid ""
+"When submitting a contribution, please clearly identify its copyright holder "
+"and include the licensing statement. Note that to be accepted, the "
+"contribution must be licensed under the same license as the rest of the "
+"document, namely, GPL version 3 or later."
+msgstr ""
+"Lorsque vous soumettez une contribution, veuillez indiquer clairement le "
+"copyright et inclure la mention légale relative à la licence. Notez que pour "
+"être acceptée, la contribution doit être déposée sous la même licence que le "
+"reste du document, c'est-à-dire la GPL version 3 ou ultérieure."
+
+#. type: Plain text
+#: en/about_manual.ssi:78
+msgid ""
+"The sources for this manual are maintained using the Git version control "
+"system. You can checkout the latest copy by executing:"
+msgstr ""
+"Les sources de ce manuel sont maintenues à l'aide du logiciel de gestion de "
+"versions Git. Vous pouvez obtenir la dernière copie en exécutant:"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:82
+msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/about_manual.ssi:86
+msgid ""
+"Prior to submission of your contribution, please preview your work. To "
+"preview the live-manual, ensure the packages needed for building are "
+"installed by executing:"
+msgstr ""
+"Avant de soumettre votre contribution, veuillez prévisualiser votre travail. "
+"Afin de prévisualiser live-manual, assurez-vous que les paquets nécessaires "
+"sont installés en exécutant:"
+
+#. type: Plain text
+#: en/about_manual.ssi:90
+msgid "# apt-get install make po4a sisu-complete"
+msgstr "# apt-get install make po4a sisu-complete"
+
+#. type: Plain text
+#: en/about_manual.ssi:94
+msgid ""
+"You may build the live-manual from the top level directory of your git "
+"checkout by executing:"
+msgstr ""
+"Vous pouvez compiler live-manual depuis le répertoire racine de votre "
+"checkout git en exécutant:"
+
+#. type: Plain text
+#: en/about_manual.ssi:98
+msgid "$ make build"
+msgstr "$ make build"
+
+#. type: Plain text
+#: en/about_manual.ssi:102
+msgid "3~ Applying patches"
+msgstr "3~ Appliquer des patches"
+
+#. type: Plain text
+#: en/about_manual.ssi:104
+msgid ""
+"Directly commiting to the repository is possible by anyone. However, we ask "
+"you to send bigger changes to the mailing list to discuss them first. In "
+"order to push to the repository, the following steps are required."
+msgstr ""
+"Les contributions directes au répertoire sont possibles pour tout le monde. "
+"Cependant, nous vous demandons d'envoyer les changements conséquents sur la "
+"liste de discussion au préalable. Afin de de faire un push sur le "
+"répertoire, les étapes suivantes sont nécessaires."
+
+#. type: Plain text
+#: en/about_manual.ssi:106
+msgid "_* Fetch the public commit key:"
+msgstr "_* Téléchargez la clé publique:"
+
+#. type: Plain text
+#: en/about_manual.ssi:115
+#, no-wrap
+msgid ""
+"$ mkdir -p ~/.ssh/identity.d\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+msgstr ""
+"$ mkdir -p ~/.ssh/identity.d\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:119
+msgid "_* Add the following section to your openssh-client config:"
+msgstr "_* Ajoutez la section suivante à votre configuration openssh-client:"
+
+#. type: Plain text
+#: en/about_manual.ssi:128
+#, no-wrap
+msgid ""
+"$ cat >> ~/.ssh/config << EOF\n"
+"Host live.debian.net\n"
+"        Hostname live.debian.net\n"
+"        User gitosis\n"
+"        IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+"EOF\n"
+msgstr ""
+"$ cat >> ~/.ssh/config << EOF\n"
+"Host live.debian.net\n"
+"        Hostname live.debian.net\n"
+"        User gitosis\n"
+"        IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+"EOF\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:132
+msgid "_* Checkout a clone of the manual through ssh:"
+msgstr "_* Clonez le manuel via ssh:"
+
+#. type: Plain text
+#: en/about_manual.ssi:136
+msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
+msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
+
+#. type: Plain text
+#: en/about_manual.ssi:140
+msgid ""
+"_* After editing the files in manual/en/, please call the 'commit' target in "
+"the top level directory to sanitize the files and update the translation "
+"files:"
+msgstr ""
+"_* Après édition des fichiers dans manual/en/, veuillez appeler 'commit' "
+"dans le dossier racine du répertoire afin de de nettoyer les fichier et de "
+"mettre à jour les fichiers de traduction:"
+
+#. type: Plain text
+#: en/about_manual.ssi:144
+msgid "$ make commit"
+msgstr "$ make commit"
+
+#. type: Plain text
+#: en/about_manual.ssi:148
+msgid ""
+"_* After sanitizing commit the changes. Write commit messages, that consist "
+"of full useful sentences, starting with a capital letter and ending with a "
+"full stop. Usually starting with the form 'Fixing/Adding/Removing/"
+"Correcting/':"
+msgstr ""
+"_* Après nettoyage, soumettre les modifications. Veuillez écrire les "
+"commentaires de commit à l'aide de phrases complètes, en commençant par une "
+"majuscule et en terminant par un point, et en commençant par 'Fixing/Adding/"
+"Removing/Correcting/':"
+
+#. type: Plain text
+#: en/about_manual.ssi:152
+msgid "$ git commit -a"
+msgstr "$ git commit -a"
+
+#. type: Plain text
+#: en/about_manual.ssi:156
+msgid "_* Push the commit to the server:"
+msgstr "_* Envoyez votre commit au serveur:"
+
+#. type: Plain text
+#: en/about_manual.ssi:160
+msgid "$ git push"
+msgstr "$ git push"
diff --git a/manual/po/de/about_project.ssi.po b/manual/po/fr/about_project.ssi.po
similarity index 92%
copy from manual/po/de/about_project.ssi.po
copy to manual/po/fr/about_project.ssi.po
index 3393dba..d4d9b96 100644
--- a/manual/po/de/about_project.ssi.po
+++ b/manual/po/fr/about_project.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,25 +6,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"PO-Revision-Date: 2010-10-16 11:30-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_project.ssi:2
 msgid ":B~ About the Debian Live Project"
-msgstr ":B~ Über das Debian Live Projekt"
+msgstr ""
 
 #. type: Plain text
 #: en/about_project.ssi:4
 msgid "1~ About the Debian Live Project"
-msgstr "1~ Über das Debian Live Projekt"
+msgstr ""
 
 #. type: Plain text
 #: en/about_project.ssi:6
@@ -192,20 +192,15 @@ msgstr ""
 #. type: Plain text
 #: en/about_project.ssi:60
 msgid ""
-"A system for configuring packages is provided using debconf in #{lh config}# "
+"A system for configuring packages is provided using debconf in #{lb config}# "
 "(use --preseed FILE) allowing custom configured packages to be installed in "
 "your custom produced Debian Live images, but for official live images only "
 "default configuration will be used. For more information, please see "
-"customization."
+"{Customization overview}#customization-overview."
 msgstr ""
 
 #. type: Plain text
 #: en/about_project.ssi:62
-msgid "% FIXME: <xref linkend=\"customization\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:64
 msgid ""
 "Exception: There are a few essential changes needed to bring a live system "
 "to life (e.g. configuring pam to allow empty passwords). These essential "
@@ -214,12 +209,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:66
-msgid "2~ Contact"
+#: en/about_project.ssi:64
+msgid "2~contact Contact"
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:68
+#: en/about_project.ssi:66
 msgid ""
 "_* *{Mailing list}*: The primary contact for the project is the mailing list "
 "at http://lists.debian.org/debian-live/. You can email the list directly by "
@@ -228,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:70
+#: en/about_project.ssi:68
 msgid ""
 "_* *{IRC}*: A number of users and developers are present in the #debian-live "
 "channel on irc.debian.org (OFTC). When asking a question on IRC, please be "
@@ -237,21 +232,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:72
+#: en/about_project.ssi:70
 msgid ""
 "_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
 "reported by users and developers. Each bug is given a number, and is kept on "
 "file until it is marked as having been dealt with. For more information, "
-"please see bugs."
-msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:74
-msgid "% FIXME: <xref linkend=\"bugs\"/>"
+"please see {Reporting bugs}#bugs."
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:75
+#: en/about_project.ssi:71
 msgid ""
 "_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
 "place to gather information, discuss applied technologies, and document "
diff --git a/manual/po/de/index.html.in.po b/manual/po/fr/index.html.in.po
similarity index 63%
copy from manual/po/de/index.html.in.po
copy to manual/po/fr/index.html.in.po
index 54a77a2..05508ed 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/fr/index.html.in.po
@@ -1,55 +1,52 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
+# French translations for live-manual package
+# 2010 Christophe Siraut <chris at tobald.eu.org>
+# This file is distributed under the same license as the live-config package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a3\n"
-"POT-Creation-Date: 2010-10-03 12:43+0300\n"
-"PO-Revision-Date: 2010-06-06 15:21+0300\n"
-"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
+"Project-Id-Version: live-manual 2.0~a8\n"
+"POT-Creation-Date: 2010-10-20 20:02+0300\n"
+"PO-Revision-Date: 2010-10-21 19:05+0100\n"
+"Last-Translator: Christophe Siraut <chris at tobald.eu.org>\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Content of: <html><head><title>
 #: en/index.html.in:4
 msgid "Debian Live Project"
-msgstr "Debian Live Projekt"
+msgstr "Projet Debian Live"
 
 #. type: Content of: <html><body><h2>
 #: en/index.html.in:8
 msgid "Debian Live Manual"
-msgstr "Debian Live Handbuch"
+msgstr "Manuel Debian Live"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:11
 msgid "<i>This manual is under heavy construction.</i>"
-msgstr ""
-"<i>Dieses Handbuch ist noch nicht fertig und befindet sich im Aufbau.</i>"
+msgstr "<i>Ce manuel est en cours d'élaboration.</i>"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:15
 msgid ""
 "Please report errors, omissions, patches and suggestions to our mailinglist "
 "at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/meta.html#contributing\">how to "
-"contribute</a> to the manual."
+"org</a> and read about <a href=\"html/1.html#37\">how to contribute</a> to "
+"the manual."
 msgstr ""
-"Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste "
-"unter <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists."
-"debian.org</a> (englischspraching) gemeldet werden. Informationen wie man <a "
-"href=\"html/meta.html#contributing\">zum Handbuch beitragen</a> kann, können "
-"im Handbuch gefunden werden."
+"Veuillez transmettre les erreurs, omissions, patches et suggestions sur "
+"notre liste de discussion <a href=\"mailto:debian-live at lists.debian.org"
+"\">debian-live at lists.debian.org</a> et lire  <a href=\"html/1."
+"html#37\">comment contribuer</a> au manuel."
 
 #. type: Content of: <html><body><h3>
 #: en/index.html.in:18
 msgid "Available Formats"
-msgstr "Verfügbare Formate"
+msgstr "Formats disponibles"
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:21
@@ -62,8 +59,8 @@ msgid ""
 "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
 "html\">single page</a>"
 msgstr ""
-"HTML: <a href=\"html/index.html\">mehrere Seiten</a>, <a href=\"html/live-"
-"manual.html\">einzelne Seite</a>"
+"HTML: <a href=\"html/index.html\">multi pages</a>, <a href=\"html/live-"
+"manual.html\">page unique</a>"
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:23
@@ -78,30 +75,30 @@ msgid ""
 "manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
 "landscape-letter.pdf\">letter landscape</a>"
 msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 Hochformat</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 Querformat</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">Letter Hochformat</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.pdf\">Letter Querformat</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.pdf\">A4 paysage</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.pdf\">US portrait</a>, <a href=\"pdf/live-manual."
+"landscape-letter.pdf\">US paysage</a>"
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:25
 msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
-msgstr "<a href=\"txt/live-manual.txt\">Text</a>"
+msgstr "<a href=\"txt/live-manual.txt\">Texte brut</a>"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:29
 msgid "Last changed: @DATE_CHANGE@"
-msgstr "Letzte Änderung: @DATE_CHANGE@"
+msgstr "Dernière modification: @DATE_CHANGE@"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:30
 msgid "Last built: @DATE_BUILD@"
-msgstr "Letzte Aktualisierung: @DATE_BUILD@"
+msgstr "Dernière compilation: @DATE_BUILD@"
 
 #. type: Content of: <html><body><h3>
 #: en/index.html.in:33
 msgid "Source"
-msgstr "Quellen"
+msgstr "Source"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:36
@@ -109,8 +106,8 @@ msgid ""
 "The sources for this manual is available in a <a href=\"http://git.or.cz/"
 "\">git</a> repository at live.debian.net."
 msgstr ""
-"Die Quellen dieses Handbuches sind in einem <a href=\"http://git.or.cz/"
-"\">Git</a> Repository auf live.debian.net verfügbar."
+"Les sources de ce manuel sont disponibles dans un répertoire <a href="
+"\"http://git.or.cz/\">git</a> sur live.debian.net."
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:40
@@ -119,7 +116,7 @@ msgid ""
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
 "a>"
 msgstr ""
-"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
+"Parcourir: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
 "a>"
 
@@ -141,4 +138,4 @@ msgid ""
 msgstr ""
 "<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
 "debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
-"href=\"http://live.debian.net/legal.html\">Rechtliche Hinweise</a>"
+"href=\"http://live.debian.net/legal.html\">Note légale</a>"
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
similarity index 70%
copy from manual/po/de/live-manual.ssm.po
copy to manual/po/fr/live-manual.ssm.po
index bb7f289..10ba733 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,15 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-25 23:12+0300\n"
+"PO-Revision-Date: 2010-10-21 07:06-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:2
@@ -24,7 +24,7 @@ msgstr ""
 #. type: Plain text
 #: en/live-manual.ssm:4
 msgid "@title: Debian Live Manual"
-msgstr "@title: Debian Live Handbuch"
+msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:6
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-10-03\n"
+" :published: 2010-10-25\n"
 msgstr ""
 
 #. type: Plain text
@@ -58,7 +58,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@make:\n"
-" :bold: /lenny|stable|squeeze|testing|sid|unstable/\n"
+" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
 " :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
 " :num_top: 1\n"
 " :skin: skin_debian-live\n"
@@ -106,110 +106,130 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:39
-msgid "<< user_customization-packages.ssi"
+msgid "<< user_managing_a_configuration.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:41
-msgid "<< user_customization-contents.ssi"
+msgid "<< user_customization-overview.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:43
-msgid ":B~ Development ~#"
+msgid "<< user_customization-packages.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:45
-msgid ":B~ Project ~#"
+msgid "<< user_customization-contents.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid ":B~ Other ~#"
+msgid "<< user_customization-internationalization.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid "<< other_customization-internationalization.ssi"
+msgid ":B~ Development ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:51
-msgid "<< other_customization-bootup.ssi"
+msgid ":B~ Project ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:53
-msgid "<< other_customization-binary.ssi"
+msgid "<< project_bugs.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
-msgid "<< other_customization-backports.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:57
-msgid "<< other_common-tasks.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:59
-msgid "<< other_live-environment.ssi"
+msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:61
-msgid "<< other_faq.ssi"
+msgid ""
+"Other material that formerly appeared in this section is out of date and/or "
+"has not been approved for release. It has therefore been omitted, but can "
+"still be found in the document source; see 'About this manual'. Any part of "
+"the omitted material that is still useful will be included in the release "
+"only after it has been reviewed."
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:63
-msgid "<< other_reporting-bugs.ssi"
+msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:65
-msgid "<< other_howtos.ssi"
+msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:67
-msgid "<< other_coding-style.ssi"
+msgid "% << other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:69
-msgid "<< other_procedures.ssi"
+msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:71
-msgid "<< other_resources.ssi"
+msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:73
-msgid "<< other_use-cases.ssi"
+msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:75
-msgid "<< other_success-stories.ssi"
+msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:77
-msgid "<< other_troubleshooting.ssi"
+msgid "% << other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:79
-msgid "<< other_configuration-layout.ssi"
+msgid "% << other_procedures.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:81
+msgid "% << other_resources.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:83
+msgid "% << other_use-cases.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:85
+msgid "% << other_success-stories.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:87
+msgid "% << other_troubleshooting.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:89
+msgid "% << other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:80
-msgid "<< other_configuration-files.ssi"
+#: en/live-manual.ssm:90
+msgid "% << other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/po/de/other_coding-style.ssi.po b/manual/po/fr/other_coding-style.ssi.po
similarity index 98%
copy from manual/po/de/other_coding-style.ssi.po
copy to manual/po/fr/other_coding-style.ssi.po
index 81ab20f..b86af4d 100644
--- a/manual/po/de/other_coding-style.ssi.po
+++ b/manual/po/fr/other_coding-style.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +72,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +129,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_coding-style.ssi:2
diff --git a/manual/po/de/other_common-tasks.ssi.po b/manual/po/fr/other_common-tasks.ssi.po
similarity index 60%
copy from manual/po/de/other_common-tasks.ssi.po
copy to manual/po/fr/other_common-tasks.ssi.po
index 10396a9..a2bbdb2 100644
--- a/manual/po/de/other_common-tasks.ssi.po
+++ b/manual/po/fr/other_common-tasks.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,95 +6,92 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,31 +102,39 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_common-tasks.ssi:2
@@ -190,7 +195,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_common-tasks.ssi:18
 msgid ""
-"This whole process can be preseeded and customised in a number of ways; see "
+"This whole process can be preseeded and customized in a number of ways; see "
 "the relevant \"DebianInstaller\" wiki page and installation guide for more. "
 "This is operational now withing live-helper."
 msgstr ""
diff --git a/manual/po/de/other_configuration-files.ssi.po b/manual/po/fr/other_configuration-files.ssi.po
similarity index 99%
copy from manual/po/de/other_configuration-files.ssi.po
copy to manual/po/fr/other_configuration-files.ssi.po
index 8c1ca55..0489d75 100644
--- a/manual/po/de/other_configuration-files.ssi.po
+++ b/manual/po/fr/other_configuration-files.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/other_configuration-files.ssi:2
diff --git a/manual/po/de/other_configuration-layout.ssi.po b/manual/po/fr/other_configuration-layout.ssi.po
similarity index 97%
copy from manual/po/de/other_configuration-layout.ssi.po
copy to manual/po/fr/other_configuration-layout.ssi.po
index ad61482..7c80cb6 100644
--- a/manual/po/de/other_configuration-layout.ssi.po
+++ b/manual/po/fr/other_configuration-layout.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/other_configuration-layout.ssi:2
diff --git a/manual/po/de/other_customization-internationalization.ssi.po b/manual/po/fr/other_customization-backports.ssi.po
similarity index 74%
rename from manual/po/de/other_customization-internationalization.ssi.po
rename to manual/po/fr/other_customization-backports.ssi.po
index fbcfc1e..2891bac 100644
--- a/manual/po/de/other_customization-internationalization.ssi.po
+++ b/manual/po/fr/other_customization-backports.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +72,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,95 +129,36 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:2
-msgid "B~ Customising Locale And Language"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
-#: en/other_customization-internationalization.ssi:4
-msgid "1~ Customising Locale And Language"
+#: en/other_customization-backports.ssi:2
+msgid "B~ Using a newer kernel with Lenny"
 msgstr ""
 
 #. type: Plain text
-#: en/other_customization-internationalization.ssi:6
-msgid "2~ Default locale and keyboard"
+#: en/other_customization-backports.ssi:4
+msgid "1~ Using a newer kernel with Lenny"
 msgstr ""
 
 #. type: Plain text
-#: en/other_customization-internationalization.ssi:8
+#: en/other_customization-backports.ssi:6
 msgid ""
-"The default locale when building a live cd is \"locale=en_US.UTF-8\". To set "
-"the locale for the UK (locale=en_GB.UTF-8)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:12
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:16
-msgid "The entry for a British keyboard would be"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:20
-msgid "$ lh_config --bootappend-live \"keyb=uk\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:24
-msgid ""
-"To configure both the locale and the keyboard for the UK the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:28
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8 keyb=uk\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:32
-#: en/user_installation.ssi:44
-msgid "or"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:36
-msgid "$ lh_config --bootappend-live \"locale=uk\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:40
-msgid ""
-"Note: You can find a list of options in the manpage for live-initramfs. Only "
-"UTF8 locales are supported by live-initramfs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:42
-msgid "2~ l10n Packages"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:44
-msgid ""
-"lh build can automatically check for each package, for which it's know that "
-"there are -l10n packages available and install them. To add Swedish packages "
-"the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:48
-msgid "$ lh_config --language \"se\""
+"The backports repository, backports.org, lacks the necessary module packages "
+"(linux-modules-extra-2.6, aufs, etc.) so an alternative repository has been "
+"set up, in order to build Lenny live images with a later kernel. Shown here "
+"is one way of doing it."
 msgstr ""
 
 #. type: Plain text
-#: en/other_customization-internationalization.ssi:51
+#: en/other_customization-backports.ssi:15
 msgid ""
-"This will also change the default syslinux language if #{config/templates/"
-"syslinux/se}# is available. Check syslinux configuration FIXME"
+"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6' $ echo 'deb "
+"http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/"
+"chroot_sources/backports-kernel.chroot $ echo 'deb http://unsupported.debian-"
+"maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-"
+"kernel.binary $ wget http://unsupported.debian-maintainers.org/backports-"
+"kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg "
+"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-"
+"key.asc -O config/chroot_sources/backports-kernel.binary.gpg # lh_build"
 msgstr ""
diff --git a/manual/po/de/other_customization-binary.ssi.po b/manual/po/fr/other_customization-binary.ssi.po
similarity index 88%
copy from manual/po/de/other_customization-binary.ssi.po
copy to manual/po/fr/other_customization-binary.ssi.po
index 18724ed..de10d4d 100644
--- a/manual/po/de/other_customization-binary.ssi.po
+++ b/manual/po/fr/other_customization-binary.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,24 +6,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/other_customization-binary.ssi:2
-msgid "B~ Customising the binary image"
+msgid "B~ Customizing the binary image"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-binary.ssi:4
-msgid "1~ Customising the binary image<"
+msgid "1~ Customizing the binary image<"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/other_customization-bootup.ssi.po b/manual/po/fr/other_customization-bootup.ssi.po
similarity index 58%
copy from manual/po/de/other_customization-bootup.ssi.po
copy to manual/po/fr/other_customization-bootup.ssi.po
index 360517d..4734290 100644
--- a/manual/po/de/other_customization-bootup.ssi.po
+++ b/manual/po/fr/other_customization-bootup.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,95 +6,92 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,46 +102,54 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:2
-msgid "B~ Customising the bootup process"
+msgid "B~ Customizing the bootup process"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:4
-msgid "1~ Customising the bootup process"
+msgid "1~ Customizing the bootup process"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:6
 msgid ""
-"This chapter discusses customisation of bootup process of a live system, "
+"This chapter discusses customization of bootup process of a live system, "
 "including kernel options, modifications to the bootloader, \"splash\" "
 "screens and startup scripts."
 msgstr ""
diff --git a/manual/po/de/other_faq.ssi.po b/manual/po/fr/other_faq.ssi.po
similarity index 87%
copy from manual/po/de/other_faq.ssi.po
copy to manual/po/fr/other_faq.ssi.po
index de35d69..7316242 100644
--- a/manual/po/de/other_faq.ssi.po
+++ b/manual/po/fr/other_faq.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,95 +6,92 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,31 +102,39 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_faq.ssi:2
@@ -466,7 +471,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_faq.ssi:163
 msgid ""
-"Q: How do I add software not in Debian ? A: See Customising package "
+"Q: How do I add software not in Debian ? A: See Customizing package "
 "installation % FIXME: <xref linkend=\"packages\"/>"
 msgstr ""
 
@@ -643,7 +648,7 @@ msgstr ""
 #: en/other_faq.ssi:234
 msgid ""
 "Q: How do I get past boot prompt without a working keyboard? A: See "
-"Customising the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
+"Customizing the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
 "Boot from an USB-HDD on an iMac with GRUB did not work."
 msgstr ""
 
diff --git a/manual/po/de/other_howtos.ssi.po b/manual/po/fr/other_howtos.ssi.po
similarity index 99%
copy from manual/po/de/other_howtos.ssi.po
copy to manual/po/fr/other_howtos.ssi.po
index d98d7ea..99b3eb1 100644
--- a/manual/po/de/other_howtos.ssi.po
+++ b/manual/po/fr/other_howtos.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +72,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +129,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_howtos.ssi:2
diff --git a/manual/po/de/other_live-environment.ssi.po b/manual/po/fr/other_live-environment.ssi.po
similarity index 99%
copy from manual/po/de/other_live-environment.ssi.po
copy to manual/po/fr/other_live-environment.ssi.po
index fea7cfb..d33472d 100644
--- a/manual/po/de/other_live-environment.ssi.po
+++ b/manual/po/fr/other_live-environment.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +72,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +129,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
diff --git a/manual/po/de/other_procedures.ssi.po b/manual/po/fr/other_procedures.ssi.po
similarity index 98%
copy from manual/po/de/other_procedures.ssi.po
copy to manual/po/fr/other_procedures.ssi.po
index 3858198..8c4f0e2 100644
--- a/manual/po/de/other_procedures.ssi.po
+++ b/manual/po/fr/other_procedures.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +72,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +129,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_procedures.ssi:2
@@ -335,7 +335,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_procedures.ssi:91
 msgid "Debian Live project homepage:"
-msgstr "Debian Live Projekt Homepage:"
+msgstr ""
 
 #. type: Plain text
 #: en/other_procedures.ssi:93
diff --git a/manual/po/de/other_resources.ssi.po b/manual/po/fr/other_resources.ssi.po
similarity index 95%
copy from manual/po/de/other_resources.ssi.po
copy to manual/po/fr/other_resources.ssi.po
index ebfbb80..d8a7aa8 100644
--- a/manual/po/de/other_resources.ssi.po
+++ b/manual/po/fr/other_resources.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
diff --git a/manual/po/de/other_success-stories.ssi.po b/manual/po/fr/other_success-stories.ssi.po
similarity index 91%
copy from manual/po/de/other_success-stories.ssi.po
copy to manual/po/fr/other_success-stories.ssi.po
index c88b9e3..e74b998 100644
--- a/manual/po/de/other_success-stories.ssi.po
+++ b/manual/po/fr/other_success-stories.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
diff --git a/manual/po/de/other_troubleshooting.ssi.po b/manual/po/fr/other_troubleshooting.ssi.po
similarity index 91%
copy from manual/po/de/other_troubleshooting.ssi.po
copy to manual/po/fr/other_troubleshooting.ssi.po
index 05185bd..b2be287 100644
--- a/manual/po/de/other_troubleshooting.ssi.po
+++ b/manual/po/fr/other_troubleshooting.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/other_troubleshooting.ssi:2
diff --git a/manual/po/de/other_use-cases.ssi.po b/manual/po/fr/other_use-cases.ssi.po
similarity index 99%
copy from manual/po/de/other_use-cases.ssi.po
copy to manual/po/fr/other_use-cases.ssi.po
index 172dd6e..6bff3e4 100644
--- a/manual/po/de/other_use-cases.ssi.po
+++ b/manual/po/fr/other_use-cases.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +72,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +129,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
new file mode 100644
index 0000000..6e963eb
--- /dev/null
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -0,0 +1,491 @@
+# French translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"PO-Revision-Date: 2010-10-25 23:27+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/project_bugs.ssi:58 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:224 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:38
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
+#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
+#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
+#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
+#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_bugs.ssi:2
+msgid "B~ Reporting bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:4
+msgid "1~bugs Reporting bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:6
+msgid ""
+"Debian Live is far from being perfect, but we want to make it as close as "
+"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"better to fill a report twice than never. However, this chapter includes "
+"recommendations how to file good bug reports."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:8
+msgid "For the impatient:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:10
+msgid ""
+"_* Always check first the image status updates on our homepage at http://"
+"live.debian.net/ for known issues."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:12
+msgid ""
+"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
+"build, live-boot, and live-config before submitting a bug report."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:14
+msgid ""
+"_* Try to give *{as specific information as possible}* about the bug. This "
+"includes (at least) the version of live-build, live-boot, and live-config "
+"used and the distribution of the live system you are building."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:16
+msgid "2~ Known issues"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:18
+msgid ""
+"Due to the nature of Debian testing and Debian unstable distributions being "
+"a moving target, building a live system may not always be possible."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:20
+msgid ""
+"If this is a problem, do not build a system based on testing or unstable, "
+"but go with stable. live-build does always default to the current stable "
+"release."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:22
+msgid ""
+"Currently known issues are listed under the section 'status' on our homepage "
+"at http://live.debian.net/"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:24
+msgid ""
+"It is out of the scope of this manual to train you in correctly identifying "
+"and fixing problems in packages of the development distributions, however, "
+"there are two things you can always try: When not succeeding to build "
+"testing, try if unstable works. If unstable does not work either, revert to "
+"testing and pinning the newer version of the failing package from unstable."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:26
+msgid "2~ Rebuild from scratch"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:28
+msgid ""
+"To ensure that a particular bug is not caused by an unclean built system, "
+"please always rebuild the whole live system from scratch to see if the bug "
+"is reproducible."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:30
+msgid "2~ Use up-to-date packages"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:32
+msgid ""
+"Using outdated packages can cause significant problems when trying to "
+"reproduce (and ultimately fix) your problem."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:34
+msgid "2~collect-information Collect information"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:36
+msgid ""
+"Please provide enough information with your report. At a minimum, it should "
+"contain the exact version of live-build version where the bug is "
+"encountered, and steps to reproduce it. Please use common sense and include "
+"other relevant information if you think that it might help in solving the "
+"problem."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:38
+msgid ""
+"To make the most out of your bug report, we require at least the following "
+"information:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:40
+msgid "_* Architecture of the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:42
+msgid "_* Version of live-build on the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:44
+msgid "_* Version of live-boot on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:46
+msgid "_* Version of live-config on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:48
+msgid "_* Version of debootstrap and/or cdebootstrap on the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:50
+msgid "_* Architecture of the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
+msgid "_* Distribution of the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:54
+msgid "_* Version of the kernel on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:56
+msgid "You can generate a log of the build process by using the tee command:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:60
+msgid "lb build 2>&1 | tee build.log"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:64
+msgid ""
+"Additionally, to rule out other errors, it is always a good idea to tar up "
+"your config directory and upload it somewhere (do *{not}* send it as an "
+"attachment to the mailinglist), so that we can try to reproduce the errors "
+"you encountered."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:66
+msgid ""
+"Remember to send in any logs that were produced with English locale "
+"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
+"{LC_ALL=en_US}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:68
+msgid "2~ Use the correct package to report the bug against"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:70
+msgid "Where does the bug appear?"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:72
+msgid "3~ At build time whilst bootstrapping"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:74
+msgid ""
+"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
+"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"distribution it is bootstrapping, it may fail. If a bug appears here, check "
+"if the error is related to a specific Debian package (most likely), or if it "
+"is related to bootstrapping tool itself."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:76
+msgid ""
+"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
+"which we can not fix this directly. Please report such a bug against the "
+"bootstrapping tool or the failing package."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:78
+msgid "3~ At build time whilst installing packages"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:80
+msgid ""
+"live-build installs additional packages from the Debian archive and "
+"depending on the Debian distribution used and the daily archive state, it "
+"can fail. If a bug appears here, check if the error is also reproducible on "
+"a normal system."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:82
+msgid ""
+"If this is the case, this is not a bug in Debian Live, but rather in Debian "
+"- please report it against the failing package. Running debootstrap "
+"seperately from the Live system build or running lb bootstrap with #{--debug}"
+"# will give you more information."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
+msgid ""
+"Also, if you are using a local mirror and/or any of sort of proxy and you "
+"are experiencing a problem, please always reproduce it first by "
+"bootstrapping from an official mirror."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:86
+msgid "3~ At boot-time"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:88
+msgid ""
+"If your image does not boot, please report it to the mailing list together "
+"with the information requested in {Collect information}#collect-information. "
+"Do not forget to mention, how/when the image failed, in Qemu, VMWare or real "
+"hardware. If you are using a virtualization technology of any kind, please "
+"always run it on real hardware before reporting a bug. Providing a "
+"screenshot of the failure is also very helpful."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:90
+msgid "3~ At run-time"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:92
+msgid ""
+"If a package was successfully installed, but fails while actually running "
+"the Live system, this is probably a bug in Debian Live. However,"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:94
+msgid "2~ Do the research"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:96
+msgid ""
+"Before filing the bug, please search the web for the particular error "
+"message or symptom you are getting. As it is highly unlikely that you are "
+"the only person experiencing a particular problem, there is always a chance "
+"that it has been discussed elsewhere, and a possible solution, patch, or "
+"workaround has been proposed."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:98
+msgid ""
+"You should pay particular attention to the Debian Live mailing list, as well "
+"as the homepage, as these are likely to contain the most up-to-date "
+"information. If such information exists, always include the references to it "
+"in your bug report."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:100
+msgid ""
+"In addition, you should check the current bug lists for live-build, live-"
+"boot, and live-config to see whether something similar has been reported "
+"already."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:102
+msgid "2~ Where to report bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:104
+msgid ""
+"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
+"System (BTS). For information on how to use the system, please see http://"
+"bugs.debian.org/. You can also submit the bugs by using the #{reportbug}# "
+"command from the package with the same name."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:106
+msgid ""
+"In general, you should report build time errors against the live-build "
+"package, boot time errors against live-boot, and run time errors against "
+"live-config. If you are unsure of which package is appropriate or need more "
+"help before submitting a bug report, please send a message to the mailing "
+"list and we will help you to figure it out."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:107
+msgid ""
+"Please note that bugs found in distributions derived from Debian (such as "
+"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
+"can be also reproduced on a Debian system using official Debian packages."
+msgstr ""
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
similarity index 73%
copy from manual/po/de/user_basics.ssi.po
copy to manual/po/fr/user_basics.ssi.po
index e8d344f..eed62b0 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-20 06:53-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,32 +101,40 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_basics.ssi:2
@@ -159,17 +164,11 @@ msgid ""
 "A live system usually means an operating system booted on a computer from a "
 "removable medium (such as CD-ROM, USB stick, or network), ready to use "
 "without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see terms)."
+"done at runtime (see {Terms}#terms )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:14
+#: en/user_basics.ssi:12
 msgid ""
 "With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
 "the supported architectures (currently amd64, i386, powerpc and sparc). It "
@@ -177,17 +176,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:16
+#: en/user_basics.ssi:14
 msgid "_* Linux kernel"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:18
+#: en/user_basics.ssi:16
 msgid "_* The Linux image, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
 msgid ""
 "_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
 "containing modules possibly needed to mount the filesystem's image and some "
@@ -195,10 +194,10 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
 msgid ""
-"_* *{System image}*: The operating systems filesystem image. Debian Live "
-"uses SquashFS, a compressed filesystem, to minimize its image size. Note "
+"_* *{System image}*: The operating systems filesystem image. The SquashFS "
+"compressed filesystem is used to minimize the Debian Live image size. Note "
 "that it's read-only. So, during boot the Debian Live system will use a RAM "
 "disk and 'union' mechanism to enable writing files within the running "
 "system. However, all modifications will be lost upon shutdown unless "
@@ -206,12 +205,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid "% FIXME: <xref linkend=\"persistence\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid ""
 "_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -225,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "_* live-build will build the system image from your specifications, setup a "
 "Linux kernel and its initrd, a bootloader to run them, all in one media-"
@@ -233,12 +232,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
 msgid ""
 "The following sequence of commands, provided by live-build, will create a "
 "basic ISO image containing just the Debian standard system without X.org. It "
@@ -246,129 +245,135 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
 msgid ""
 "By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see lb-config)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
+"the defaults (see {The lb config command}#lb-config )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:46
+#: en/user_basics.ssi:42
 msgid ""
 "Now that we have a \"config/\" hierarchy, we may build the image with the lb "
 "build command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50 en/user_basics.ssi:122 en/user_basics.ssi:204
+#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:50
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see lb-build)."
+"connection (see {The lb build command}#lb-build )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:52
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:54
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64 en/user_basics.ssi:144
+#: en/user_basics.ssi:58 en/user_basics.ssi:146
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:60
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:64
 msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:66
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:70
 msgid "# apt-get install virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:74
 msgid ""
 "and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
 "build the required kernel modules to run virtualbox-ose."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:82
+#: en/user_basics.ssi:76
 msgid ""
 "After successful installation, virtualbox can be e.g. found in the GNOME "
 "menu under 'Applications/System Tools/VirtualBox OSE'."
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:78
+msgid ""
+"Please consider including of following packages onto the live image to "
+"achieve higher resolution of the display when booting the live image in "
+"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
+"default resolution of the virtualbox-ose display shouldn't work with the gui-"
+"installer)."
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:84
+msgid ""
+"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:88
 msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:90
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:94
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:96
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:100
 msgid "2~ Building an USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:102
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -377,46 +382,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:104
 msgid ""
 "Note if you created an iso image with the previous example, you will need to "
-"clean up your working directory with the #{lb clean} command (see lb-clean):"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:102
-msgid "% FIXME: <xref linkend=\"lb-clean\"/>"
+"clean up your working directory with the #{lb clean} command (see {The lb "
+"clean command}#lb-clean ):"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:106 en/user_basics.ssi:186
+#: en/user_basics.ssi:108 en/user_basics.ssi:188
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:112
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:114
+#: en/user_basics.ssi:116
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:118
+#: en/user_basics.ssi:120
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:128
 msgid "3~ Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:130
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on an USB stick. Plug in an USB "
@@ -424,12 +425,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:132
+#: en/user_basics.ssi:134
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:138
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -437,28 +438,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:140
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:142
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:148
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:154
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -467,45 +468,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:158
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:162
 msgid ""
 "Ater the creation of the partition you have to create a filsystem on it. One "
 "possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
+#: en/user_basics.ssi:166
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:170
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
+#: en/user_basics.ssi:174
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:178
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -513,28 +514,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:184
 msgid ""
 "Note if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:192
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
+#: en/user_basics.ssi:196
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
 msgid ""
 "In contrast with the ISO and USB hdd images, netbooting does not support "
 "serving a filesystem image with the client so the files must be served via "
@@ -544,12 +545,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:202
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
 msgid ""
 "In a network boot the client runs a small piece of software, which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -560,7 +561,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
@@ -569,17 +570,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the computer netbooting, and to advertise the location of the PXE "
@@ -587,25 +588,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:220
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
 "dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:226
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:229
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -613,7 +614,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:232
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -621,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -631,7 +632,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:241
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -640,7 +641,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:244
 #, no-wrap
 msgid ""
 "    # PXE boot loader (first program to be loaded, by TFTP)\n"
@@ -648,7 +649,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:247
 #, no-wrap
 msgid ""
 "  }\n"
@@ -656,17 +657,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
 msgid "This serves the kernel and initial ramdisk to the system at run-time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:255
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
 "inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -674,27 +675,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
-msgid "dpkg-reconfigure -plow tftpd-hpa"
-msgstr ""
-
-#. type: Plain text
 #: en/user_basics.ssi:259
-msgid "code}"
+msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -702,35 +698,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:271
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:275
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:279
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:283
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -739,40 +735,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:291
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:299
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:310
 msgid ""
 "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
 "\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -781,62 +777,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:324
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:332
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:338
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:341
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:344
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:349
 msgid ""
 "ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
 "83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -844,19 +840,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:355
 msgid ""
 "_* Double click on this file (or run VMWare player and selecet this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:356
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
similarity index 66%
copy from manual/po/de/user_customization-contents.ssi.po
copy to manual/po/fr/user_customization-contents.ssi.po
index be9ddad..60a7d10 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,52 +101,54 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:2
-msgid "B~ Customising contents"
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid "B~ Customizing contents"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:4
-msgid "1~ Customising contents"
+msgid "1~customizing-contents Customizing contents"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:6
-msgid "This chapter discusses further customisation of the live system."
+msgid "This chapter discusses further customization of the live system."
 msgstr ""
 
 #. type: Plain text
@@ -210,6 +209,11 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+#: en/user_customization-contents.ssi:26
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-contents.ssi:28
 msgid "3~ Live/chroot local includes"
 msgstr ""
diff --git a/manual/po/fr/user_customization-internationalization.ssi.po b/manual/po/fr/user_customization-internationalization.ssi.po
new file mode 100644
index 0000000..dc1d045
--- /dev/null
+++ b/manual/po/fr/user_customization-internationalization.ssi.po
@@ -0,0 +1,218 @@
+# French translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"PO-Revision-Date: 2010-10-16 15:48-0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:2
+msgid "B~ Customizing locale and language"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:4
+msgid "1~customizing-locale-and-language Customizing locale and language"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:6
+msgid "2~ Default locale and keyboard"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:8
+msgid ""
+"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
+"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:12
+msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:16
+msgid "The entry for a Swiss-German keyboard would be:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:20
+msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:24
+msgid "Combined, the keyboard and locale configured for Switzerland would be:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:28
+msgid ""
+"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:32
+msgid ""
+"Note: You can find a list of options in the manpage for live-config. "
+"Currently, only UTF-8 locales are supported."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:34
+msgid "2~ l10n Packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:36
+msgid ""
+"An experimental feature of live-build is to automatically check for each "
+"package for which it is know that there are -l10n packages available and "
+"install them. To add German packages the entry would be"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:40
+msgid "$ lb config --language \"de\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:43
+msgid ""
+"This will also change the default syslinux language if translations are "
+"available or local translations have been put into #{config/templates/"
+"syslinux/de}#."
+msgstr ""
diff --git a/manual/po/fr/user_customization-overview.ssi.po b/manual/po/fr/user_customization-overview.ssi.po
new file mode 100644
index 0000000..69bad9a
--- /dev/null
+++ b/manual/po/fr/user_customization-overview.ssi.po
@@ -0,0 +1,44 @@
+# French translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"PO-Revision-Date: 2010-10-22 07:52-0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid "B~ Customizing contents"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:4
+msgid "1~customization-overview Customization overview"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:7
+msgid ""
+"% FIXME: just a stub for now.  In conversational style, cover the different "
+"kinds of customization % and link to each section within the text."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:9
+msgid ""
+"This chapter gives an overview of the various ways in which your Debian live "
+"systems may be customized. See sections {Customizing package installation}"
+"#customizing-package-installation, {Customizing contents}#customizing-"
+"contents and {Customizing locale and language}#customizing-locale-and-"
+"language."
+msgstr ""
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
similarity index 77%
copy from manual/po/de/user_customization-packages.ssi.po
copy to manual/po/fr/user_customization-packages.ssi.po
index e2d0159..c79afc7 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 08:58-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,45 +102,53 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
-#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+#: en/user_basics.ssi:230 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:2
-msgid ":B~ Customising package installation"
+msgid ":B~ Customizing package installation"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:4
-msgid "1~ Customising package installation"
+msgid "1~customizing-package-installation Customizing package installation"
 msgstr ""
 
 #. type: Plain text
@@ -461,16 +466,39 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:145
 #, no-wrap
+msgid "*{Local binary packages lists}*\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:147
+msgid ""
+"In case you want to include some required .deb packages to live media's "
+"pool/ (without installing them onto the live image) you may need to use "
+"lists using binary local package lists stored in #{config/binary_local-"
+"packageslists}#. Such media can be used as a customized debian install image "
+"for offline installations."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:149
+msgid ""
+"Package lists that exist in this directory need to have a .list suffix in "
+"order to be processed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:151
+#, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:160
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:162
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -478,75 +506,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:164
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:170
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:174
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:180
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:184
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:190
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:194
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:200
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:198
+#: en/user_customization-packages.ssi:204
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
 "in this way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:200
+#: en/user_customization-packages.ssi:206
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:202
+#: en/user_customization-packages.ssi:208
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:210
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:212
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:214
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -557,7 +585,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:216
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -568,35 +596,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:218
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:220
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:222
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:224
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
-"\" customisations but has a number of drawbacks, whilst using a custom APT "
+"\" customizations but has a number of drawbacks, whilst using a custom APT "
 "repository is more time-consuming to set up."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:226
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:228
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -605,45 +633,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:230
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:232
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:234
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:236
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:238
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:240
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:242
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -651,12 +679,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:244
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:246
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -664,12 +692,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:248
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:250
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -679,7 +707,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:252
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -689,17 +717,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:254
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:256
 msgid "3~ Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:257
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
similarity index 61%
copy from manual/po/de/user_installation.ssi.po
copy to manual/po/fr/user_installation.ssi.po
index 5e0e898..4d54cc3 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-16 20:36-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,44 +101,40 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:32
-#: en/user_installation.ssi:44
-msgid "or"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_installation.ssi:2
@@ -243,6 +236,11 @@ msgid "# apt-get install live-build"
 msgstr ""
 
 #. type: Plain text
+#: en/user_installation.ssi:44
+msgid "or"
+msgstr ""
+
+#. type: Plain text
 #: en/user_installation.ssi:48
 msgid "# aptitude install live-build"
 msgstr ""
@@ -296,17 +294,17 @@ msgid "and uninstall it with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:87
-msgid "# make uninstall }code"
+#: en/user_installation.ssi:86
+msgid "# make uninstall"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:89
+#: en/user_installation.ssi:90
 msgid "3~ From 'snapshots'"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:91
+#: en/user_installation.ssi:92
 msgid ""
 "If you do not wish to build or install live-build from source, you can use "
 "snapshots. These are built automatically from the latest version in Git and "
@@ -314,45 +312,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:93
+#: en/user_installation.ssi:94
 msgid "2~ live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:95
+#: en/user_installation.ssi:96
 #, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customised Debian Live systems. However, doing so will do no harm.\n"
+msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:97
-msgid "3~ Using a customised live-boot"
+#: en/user_installation.ssi:98
+msgid "3~ Using a customized live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:99
+#: en/user_installation.ssi:100
 msgid ""
 "To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in terms."
+"familiar with the terms mentioned in {Terms}#terms ."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:103
+#: en/user_installation.ssi:102
 msgid "_* Checkout the live-boot source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:107
+#: en/user_installation.ssi:106
 msgid "$ git clone git://live.debian.net/git/live-boot.git"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:111
+#: en/user_installation.ssi:110
 msgid "_* Make changes to your local copy"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:113
+#: en/user_installation.ssi:112
 msgid ""
 "And beware that if you want to add your pre-init script in live-bottom, you "
 "should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -360,33 +358,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:115
+#: en/user_installation.ssi:114
 msgid "_* Build a live-boot .deb"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:117
+#: en/user_installation.ssi:116
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is squeeze then you should "
-"build against squeeze. You can use a personal builder such as /{pbuilder}/ "
+"your target platform: this means if your target is Squeeze then you should "
+"build against Squeeze. You can use a personal builder such as /{pbuilder}/ "
 "or /{sbuild}/ to automate building packages in chroot. To build directly on "
 "the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ "
 "package):"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:121
 msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:126
+#: en/user_installation.ssi:125
 msgid "_* Use the generated live-boot .deb"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:128
+#: en/user_installation.ssi:127
 msgid ""
 "As live-boot is installed by live-build system, installing the package in "
 "the host system is not sufficient: you should treat the generated .deb like "
@@ -395,19 +393,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:130
+#: en/user_installation.ssi:129
 msgid ""
 "% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
 "apt\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:132
+#: en/user_installation.ssi:131
 msgid "3~ Using live-boot snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:134
+#: en/user_installation.ssi:133
 msgid ""
 "You can let live-build automatically use the latest snapshot of live-boot by "
 "configuring a third-party repository in your live-build configuration "
@@ -416,6 +414,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:138
+#: en/user_installation.ssi:137
 msgid "lb config --repository live.debian.net"
 msgstr ""
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
new file mode 100644
index 0000000..cd76359
--- /dev/null
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -0,0 +1,268 @@
+# French translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-13 17:00+0300\n"
+"PO-Revision-Date: 2010-10-13 17:00+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:88 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:2
+msgid ":B~ Managing a configuration"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:4
+msgid "1~ Managing a configuration"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:6
+msgid ""
+"This chapter explains how to manage a live configuration from initial "
+"creation, through successive revisions and successive releases of both the "
+"live-build software and the live image itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:8
+msgid "2~ Use auto to manage configuration changes"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:10
+msgid ""
+"Live configurations rarely are perfect on the first try. You'll likely need "
+"to make a series of revisions until you are satisfied. However, "
+"inconsistencies can creep into your configuration from one revision to the "
+"next if you aren't careful. The main problem is, once a variable is given a "
+"default value, that value will not be recomputed from other variables that "
+"may change in later revisions."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:12
+msgid ""
+"For example, when the distribution is first set, many 'dependent' variables "
+"are given default values that suit that distribution. However, if you later "
+"decide to change the distribution, those dependent variables continue to "
+"retain old values that are no longer appropriate."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:14
+msgid ""
+"A second, related problem is that if you run #{lb config}# and then upgrade "
+"to a new version of live-build that has changed one of the variable names, "
+"you will discover this only by manual review of the variables in your config "
+"files, which you will then need to use to set the appropriate option again."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:16
+msgid ""
+"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
+"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
+"that are designed to help you manage your configuration. Simply create an "
+"auto/config script containing #{lb config}# command with all desired "
+"options, and an auto/clean that removes the files containing configuration "
+"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"files will be executed. This will ensure that your configuration is kept "
+"internally consistent from one revision to the next and from one live-build "
+"release to the next (though you will still have to take care and read the "
+"documentation when you upgrade live-build and make adjustments as needed)."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:18
+msgid "2~ Example auto scripts"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:20
+msgid ""
+"Use the following auto script examples as the starting point for your new "
+"live-build configuration. Take note that when you call the #{lb}# command "
+"that the auto script wraps, you must specify #{noauto}# as its parameter to "
+"ensure that the auto script isn't called again, recursively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:22
+msgid "auto/config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:29
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"lb config noauto \\\n"
+"\t--architecture i386 \\\n"
+"\t${@}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:33
+msgid "auto/clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:41
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"lb clean noauto ${@}\n"
+"rm -f config/binary config/bootstrap \\\n"
+"\tconfig/chroot config/common config/source\n"
+"rm -f binary.log\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:45
+msgid "auto/build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:50
+msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:54
+msgid ""
+"Edit auto/config, changing or adding any options as you see fit. In the "
+"example above, --architecture is set to i386 so that when the image is built "
+"on an amd64 system, it will not default to building amd64 images. Change "
+"this to an appropriate value for your image (or delete it if you want to use "
+"the default) and add any additional options in continuation lines that "
+"follow."
+msgstr ""
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
similarity index 66%
copy from manual/po/de/user_overview.ssi.po
copy to manual/po/fr/user_overview.ssi.po
index d8c8b3c..14fffdc 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# French translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"PO-Revision-Date: 2010-10-21 07:06-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,41 +102,39 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_overview.ssi:2
@@ -154,13 +149,13 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:6
 msgid ""
-"This chapter contains an overview of the two main tools used in building "
-"Debian Live systems."
+"This chapter contains an overview of the three main tools used in building "
+"Debian Live systems: live-build, live-boot and live-config."
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~ live-build"
+msgid "2~live-build live-build"
 msgstr ""
 
 #. type: Plain text
@@ -209,11 +204,11 @@ msgid ""
 "Unlike debhelper, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
 "similar to tools such as #{dh-make}#. For more information about #{lb config}"
-"#, please see lb-config."
+"#, please see {The lb config command}#lb-config."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:24
+#: en/user_overview.ssi:22
 msgid ""
 "Besides the common config/common, which is used by all live-build commands, "
 "some additional files can be used to configure the behavior of specific "
@@ -223,7 +218,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:26
+#: en/user_overview.ssi:24
 msgid ""
 "For example, the #{lb_bootstrap_debootstrap}# command uses files named "
 "config/bootstrap and config/bootstrap_debootstrap to read the options it "
@@ -233,7 +228,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:28
+#: en/user_overview.ssi:26
 msgid ""
 "live-build respects environment variables which are present in the context "
 "of the shell it is running. If variables can be read from config files, then "
@@ -244,7 +239,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:30
+#: en/user_overview.ssi:28
 msgid ""
 "All config files are shell scripts which are sourced by a live-build "
 "command. That means they have to follow the normal shell syntax. You can "
@@ -252,7 +247,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:32
+#: en/user_overview.ssi:30
 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."
@@ -264,87 +259,68 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:34
-msgid "Please see installation for information on how to install live-build."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:36
-msgid "% FIXME: <xref linkend=\"installation\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:38
+#: en/user_overview.ssi:32
 msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:34
 msgid ""
-"_* *{lb config}*: Responsible for initialising a Live system configuration "
-"directory. See lb-config for more information."
+"_* *{lb config}*: Responsible for initializing a Live system configuration "
+"directory. See {The lb config command}#lb-config for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:36
 msgid ""
-"_* *{lb build}*: Responsible for starting a Live system build. See lb-build "
-"for more information."
+"_* *{lb build}*: Responsible for starting a Live system build. See {The lb "
+"build command}#lb-build for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:48
+#: en/user_overview.ssi:38
 msgid ""
 "_* *{lb clean}*: Responsible for removing parts of a Live system build. See "
-"lb-clean for more information."
+"{The lb clean command}#lb-clean for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:50
-msgid "% FIXME: <xref linkend=\"lb-clean\"/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:52
-msgid "3~ The #{lb config}# command"
+#: en/user_overview.ssi:40
+msgid "3~lb-config The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:42
 msgid ""
-"As discussed in live-build, the scripts that make up live-build source their "
-"configuration from a single directory named config/. As constructing this "
-"directory by hand would be time-consuming and error-prone, the #{lb config}# "
-"command can be used to create skeleton configuration folders."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:56
-msgid "% FIXME: <xref linkend=\"live-build\"/>"
+"As discussed in {live-build}#live-build, the scripts that make up live-build "
+"source their configuration from a single directory named config/. As "
+"constructing this directory by hand would be time-consuming and error-prone, "
+"the #{lb config}# command can be used to create skeleton configuration "
+"folders."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:58
+#: en/user_overview.ssi:44
 msgid ""
 "Issuing #{lb config}# without any arguments creates a config subdirectory "
 "which it populates with some default settings:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:63
+#: en/user_overview.ssi:49
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:68
+#: en/user_overview.ssi:54
 msgid ""
 "$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22 "
 "user user 4096 Sep 7 13:02 config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:82
 msgid ""
 "$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary "
 "drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2 "
@@ -369,7 +345,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:86
 msgid ""
 "Using #{lb config}# without any arguments would be suitable for users who "
 "are either happy editing the generated files, or are simply happy with the "
@@ -377,7 +353,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:88
 msgid ""
 "You can ask #{lb config}# to generate a config/ directory \"preseeded\" with "
 "various options. This might be suitable if you do not require the default "
@@ -385,38 +361,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:92
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:96
 msgid ""
 "will build a config/ directory configured to include the 'gnome' package "
 "list. It is possible to specify many options:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:114
+#: en/user_overview.ssi:100
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
+#: en/user_overview.ssi:104
 msgid ""
 "A full list of options is available in the #{lb_config}# man page. Most "
 "options have a parallel with an \"LB_\" prefixed variable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
-msgid "3~ The #{lb build}# command"
+#: en/user_overview.ssi:106
+msgid "3~lb-build The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:122
+#: en/user_overview.ssi:108
 msgid ""
 "The #{lb build}# command reads in your configuration from the config/ "
 "directory. It then runs the lower lower level commands needed to build your "
@@ -424,24 +400,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
-msgid "3~ The #{lb clean}# command"
+#: en/user_overview.ssi:110
+msgid "3~lb-clean The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:126
+#: en/user_overview.ssi:112
 msgid ""
 "It is the job of the #{lb clean}# command to remove various parts of a build "
 "so subsequent builds can start from a clean state."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:128
-msgid "2~ The live-boot package"
+#: en/user_overview.ssi:114
+msgid "2~live-boot The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:130
+#: en/user_overview.ssi:116
 msgid ""
 "live-boot is a collection of scripts providing hooks for the initramfs-"
 "tools, used to generate an initramfs capable of booting live systems, such "
@@ -450,7 +426,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:132
+#: en/user_overview.ssi:118
 msgid ""
 "At boot time it will look for read-only media containing a \"/live\" "
 "directory where a root filesystem (often a compressed filesystem image like "
@@ -459,9 +435,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:133
+#: en/user_overview.ssi:120
 msgid ""
 "More information on initial ramfs in Debian can be found in the Debian Linux "
 "Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
 "on initramfs."
 msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:122
+msgid "2~live-config The live-config package"
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:124
+msgid ""
+"live-config consists of the scripts that run at boot time after live-boot to "
+"configure the live system automatically. It handles such tasks as setting "
+"the hostname, locales and timezone, creating the live user, inhibiting cron "
+"jobs and performing autologin of the live user."
+msgstr ""
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
new file mode 100644
index 0000000..2427f5a
--- /dev/null
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -0,0 +1,603 @@
+# Brazilian Portuguese translations for live-manual package
+# 2010 Bruno Gurgel <bruno.gurgel at gmail.com>
+# This file is distributed under the same license as the live-config package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0~a8\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-22 18:16-0300\n"
+"Last-Translator: Bruno Gurgel <bruno.gurgel at gmail.com>\n"
+"Language-Team: none\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:2
+msgid ":B~ About this manual"
+msgstr ":B~ Sobre esse manual"
+
+#. type: Plain text
+#: en/about_manual.ssi:4
+msgid "1~ About this manual"
+msgstr "1~ Sobre esse manual"
+
+#. type: Plain text
+#: en/about_manual.ssi:6
+msgid ""
+"The main goal of this manual is to serve as a single access point to all "
+"documentation related to the Debian Live project. It does not include end-"
+"user documentation for using a Debian Live system as far as things are live "
+"specific."
+msgstr ""
+"O principal objetivo deste manual é servir como único ponto de acesso para "
+"toda a documentação relacionada ao projeto Debian Live. Ele não inclui "
+"documentação do usuário para usar o sistema Debian Live nem sobre as coisas "
+"que são Live específicas."
+
+#. type: Plain text
+#: en/about_manual.ssi:8
+msgid ""
+"Some of the commands mentioned in the text must be executed with superuser "
+"privileges which can be obtained by becoming the root user via #{su}# or by "
+"using #{sudo}#. To distinguish between commands which may be executed by an "
+"unprivileged user and those requiring superuser privileges, commands are "
+"prepended by #{$}# or #{#}# respectively. This symbol is not a part of the "
+"command."
+msgstr ""
+"Alguns comandos mencionados no texto devem ser executados com privilégios de "
+"super-usuário, que podem ser obtidos tornando-se usuário root via #{su}# ou "
+"usando #{sudo}#. Para distinção entre os comandos que talvez possam ser "
+"executados como usuário não privilegiado e aqueles que requerem privilégios "
+"de super usuário, os comandos são precididos por: #{$}# ou #{#}# "
+"respectivamente. Esse simbolo não é parte do comando."
+
+#. type: Plain text
+#: en/about_manual.ssi:10
+msgid "2~terms Terms"
+msgstr "2~terms Terminologia"
+
+#. type: Plain text
+#: en/about_manual.ssi:12
+msgid ""
+"_* *{Live system}*: An operating system that can boot without installation "
+"to a hard drive. Live systems do not alter local operating system(s) or file"
+"(s) already installed on the computer hard drive unless instructed to do so. "
+"Live systems are typically booted from media such as CDs, DVDs or USB "
+"sticks. Some may also boot over the network."
+msgstr ""
+"_* *{Live system}*: Um sistema operacional que pode inicializar sem "
+"instalação em um disco rígido. Sistemas live não devem alterar o(s) sistema"
+"(s) operacional(s) local(is) ou arquivo(s) já instalados no disco rígido do "
+"computador a não ser que seja instruido para isso. Sistemas Live são "
+"tipicamente inicializados a partir de uma mídia como CDs, DVDs ou pendrive"
+"(s). Alguns também podem inicializar através da rede."
+
+#. type: Plain text
+#: en/about_manual.ssi:14
+msgid ""
+"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
+"live-build, live-config, and live-manual packages."
+msgstr ""
+"_* *{Debian Live}*: O sub-projeto Debian que manten os pacotes live-boot, "
+"live-build, live-config, e live-manual."
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
+"_* *{Debian Live system}*: A live system that uses software from the Debian "
+"operating system that may be booted from CDs, DVDs, USB sticks, over the "
+"network (via netboot images), and over the Internet (via boot parameter #"
+"{fetch=URL}#)."
+msgstr ""
+"_* *{Debian Live system}*: Um sistema live que usa softwares do sistema "
+"operacional Debian que também pode ser inicializado a partir de CD's, DVDs, "
+"Discos USB, através da rede (via imagens netbook), e através da Internet "
+"(via parametro de boot #{fetch=URL}#)."
+
+#. type: Plain text
+#: en/about_manual.ssi:18
+msgid "_* *{Host system}*: The environment used to create the live system."
+msgstr "_* *{Host system}*: O ambiente usado para criar o sistema live."
+
+#. type: Plain text
+#: en/about_manual.ssi:20
+msgid "_* *{Target system}*: The environment used to run the live system."
+msgstr "_* *{Target system}*: O ambiente usado para rodar o sistema live."
+
+#. type: Plain text
+#: en/about_manual.ssi:22
+msgid ""
+"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
+"boot was formerly a part of live-initramfs."
+msgstr ""
+"_* *{live-boot}*: Uma coleção de scripts usados para inicializar sistemas "
+"live. live-boot era formalmente parte do live-initramfs."
+
+#. type: Plain text
+#: en/about_manual.ssi:24
+msgid ""
+"_* *{live-build}*: A collection of scripts used to build customized Debian "
+"Live systems. live-build was formerly known as live-helper, and even earlier "
+"known as live-package."
+msgstr ""
+"_* *{live-build}*: Uma coleção de scripts usados para construir sistemas "
+"Debian live customizados. live-build era formalmente conhecido como live-"
+"helper, e ainda antes conhecido como live-package."
+
+#. type: Plain text
+#: en/about_manual.ssi:26
+msgid ""
+"_* *{live-config}*: A collection of scripts used to configure a live system "
+"during the boot process. live-config was formerly a part of live-initramfs."
+msgstr ""
+"_* *{live-config}*: Uma coleção de scripts usados para configurar um sistema "
+"live durante o processo de boot. live-config era formalmente parte do live-"
+"initramfs."
+
+#. type: Plain text
+#: en/about_manual.ssi:28
+msgid ""
+"_* *{live-manual}*: This document is maintained in a package called live-"
+"manual."
+msgstr ""
+"_* *{live-manual}*: Esse documento é mantido em um pacote chamado live-"
+"manual."
+
+#. type: Plain text
+#: en/about_manual.ssi:30
+msgid ""
+"_* *{Debian Installer (d-i)}*: The official installation system for the "
+"Debian distribution."
+msgstr ""
+"_* *{Debian Installer (d-i)}*: O sistema oficial de instalação para a "
+"distribuição Debian."
+
+#. type: Plain text
+#: en/about_manual.ssi:32
+msgid ""
+"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
+"prompt to influence the kernel or live-config."
+msgstr ""
+"_* *{Boot parameters}*: Parametros que podem ser entrados no prompt do "
+"bootloader para influenciar o kernel ou o live-config."
+
+#. type: Plain text
+#: en/about_manual.ssi:34
+msgid ""
+"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
+"instances of the GNU/Linux environment on a single system simultaneously "
+"without rebooting."
+msgstr ""
+"_* *{chroot}*: O programa chroot, chroot(8), nos habilita a rodar "
+"simultâneamente diferentes instâncias do ambiente do GNU/Linux em um único "
+"sistema sem reinicialização."
+
+#. type: Plain text
+#: en/about_manual.ssi:36
+msgid ""
+"_* *{Binary image}*: A file containing the live system, such as binary.iso "
+"or binary.img."
+msgstr ""
+"_* *{Binary image}*: Um arquivo contendo o sistema live, como binary.iso ou "
+"binary.img."
+
+#. type: Plain text
+#: en/about_manual.ssi:38
+msgid ""
+"_* *{Target distribution}*: The distribution upon which your live system "
+"will be based. This can differ from the distribution of your host system."
+msgstr ""
+"_* *{Target distribution}*: A distribuição em que o sistema live será "
+"baseado. Isso pode diferir da distribuição do seu sistema host."
+
+#. type: Plain text
+#: en/about_manual.ssi:40
+msgid ""
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
+"contains the latest officially released distribution of Debian. The testing "
+"distribution is the staging area for the next stable release. A major "
+"advantage of using this distribution is that it has more recent versions of "
+"software relative to the stable release. The unstable distribution is where "
+"active development of Debian occurs. Generally, this distribution is run by "
+"developers and those who like to live on the edge."
+msgstr ""
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: A distribuição estável"
+"(stable) contem a última versão oficial lançada do Debian. A distribuição "
+"\"Testing\"  é a ária de estágio para a próxima versão estável(stable). A "
+"maior vantagem de usar essa distribuição é que ela tem versões mais recentes "
+"de software relacionado com a versão estável(stable). A distribuição instável"
+"(unstable) é onde ocorre o desenvolvimento ativo do Debian. Geralmente, essa "
+"distribuição é mantida por desenvolvedores e aqueles que vivem no limite."
+
+#. type: Plain text
+#: en/about_manual.ssi:42
+msgid ""
+"At the time of writing, Squeeze is the current stable release and Wheezy is "
+"the current testing release. Sid will always be a synonym for the unstable "
+"release."
+msgstr ""
+"No tempo da escrita, Squeeze é o a atual versão estável(stable) e Wheezy é a "
+"atual versão testing. Sid sempre será um sinônimo para a versão instável"
+"(unstable)."
+
+#. type: Plain text
+#: en/about_manual.ssi:44
+msgid "2~ Authors"
+msgstr "2~Autores"
+
+#. type: Plain text
+#: en/about_manual.ssi:46
+msgid "A list of authors (in alphabetical order):"
+msgstr "A lista de autores (em ordem alfabética)"
+
+#. type: Plain text
+#: en/about_manual.ssi:48
+msgid "_* Ben Armstrong"
+msgstr "_* Ben Armstrong"
+
+#. type: Plain text
+#: en/about_manual.ssi:50
+msgid "_* Brendan Sleight"
+msgstr "_* Brendan Sleight"
+
+#. type: Plain text
+#: en/about_manual.ssi:52
+msgid "_* Chris Lamb"
+msgstr "_* Chris Lamb"
+
+#. type: Plain text
+#: en/about_manual.ssi:54
+msgid "_* Daniel Baumann"
+msgstr "_* Daniel Baumann"
+
+#. type: Plain text
+#: en/about_manual.ssi:56
+msgid "_* Franklin Piat"
+msgstr "_* Franklin Piat"
+
+#. type: Plain text
+#: en/about_manual.ssi:58
+msgid "_* Jonas Stein"
+msgstr "_* Jonas Stein"
+
+#. type: Plain text
+#: en/about_manual.ssi:60
+msgid "_* Kai Hendry"
+msgstr "_* Kai Hendry"
+
+#. type: Plain text
+#: en/about_manual.ssi:62
+msgid "_* Marco Amadori"
+msgstr "_* Marco Amadori"
+
+#. type: Plain text
+#: en/about_manual.ssi:64
+msgid "_* Mathieu Geli"
+msgstr "_* Mathieu Geli"
+
+#. type: Plain text
+#: en/about_manual.ssi:66
+msgid "_* Matthias Kirschner"
+msgstr "_* Matthias Kirschner"
+
+#. type: Plain text
+#: en/about_manual.ssi:68
+msgid "_* Richard Nelson"
+msgstr "_* Richard Nelson"
+
+#. type: Plain text
+#: en/about_manual.ssi:70
+msgid "_* Trent W. Buck"
+msgstr "_* Trent W. Buck"
+
+#. type: Plain text
+#: en/about_manual.ssi:72
+msgid "2~ Contributing to this document"
+msgstr "2~ Contribuindo com esse documento"
+
+#. type: Plain text
+#: en/about_manual.ssi:74
+msgid ""
+"This manual is intended as a community project and all proposals for "
+"improvements and contributions are extremely welcome. The preferred way to "
+"submit a contribution is to send it to the mailing list. Please see {Contact}"
+"#contact for more information."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:76
+msgid ""
+"When submitting a contribution, please clearly identify its copyright holder "
+"and include the licensing statement. Note that to be accepted, the "
+"contribution must be licensed under the same license as the rest of the "
+"document, namely, GPL version 3 or later."
+msgstr ""
+"Quando estiver submetendo uma contribuição, por favor identificar claramente "
+"o seu titular de direitos autorais e incluir a declaração de licenciamento. "
+"Note que para ser aceita, a contribuição deve ser licenciada obre as mesmas "
+"licenças do resto do documento, ou seja, GPL versão 3 ou superior."
+
+#. type: Plain text
+#: en/about_manual.ssi:78
+msgid ""
+"The sources for this manual are maintained using the Git version control "
+"system. You can checkout the latest copy by executing:"
+msgstr ""
+"Os fontes para esse manail são mantidos usando o sistema de controle de "
+"versão Git. Você pode fazer o checkout da ultima cópia executando:"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:82
+msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/about_manual.ssi:86
+msgid ""
+"Prior to submission of your contribution, please preview your work. To "
+"preview the live-manual, ensure the packages needed for building are "
+"installed by executing:"
+msgstr ""
+"Antes de submeter sua contribuição, por favor pré-visualize seu trabalho. "
+"Para pré-visualizar o live-manual, tenha certeza que os pacotes necessários "
+"para contruir estão instalados executando:"
+
+#. type: Plain text
+#: en/about_manual.ssi:90
+msgid "# apt-get install make po4a sisu-complete"
+msgstr "# apt-get install make po4a sisu-complete"
+
+#. type: Plain text
+#: en/about_manual.ssi:94
+msgid ""
+"You may build the live-manual from the top level directory of your git "
+"checkout by executing:"
+msgstr ""
+"Você também pode construir o live-manual a partir do primeiro nível do "
+"diretório do seu git checkout executando:"
+
+#. type: Plain text
+#: en/about_manual.ssi:98
+msgid "$ make build"
+msgstr "$ make build"
+
+#. type: Plain text
+#: en/about_manual.ssi:102
+msgid "3~ Applying patches"
+msgstr "3~ Aplicando patches"
+
+#. type: Plain text
+#: en/about_manual.ssi:104
+msgid ""
+"Directly commiting to the repository is possible by anyone. However, we ask "
+"you to send bigger changes to the mailing list to discuss them first. In "
+"order to push to the repository, the following steps are required."
+msgstr ""
+"Diretamente cometer ao repoitório é possivel por qualquer um. No entanto, "
+"nós pedimo que você mande maiores mudanças para a lista de e-mail para "
+"discuti-las primeiro. Para enviar ao repositório, os seguintes passos são "
+"necessários:"
+
+#. type: Plain text
+#: en/about_manual.ssi:106
+msgid "_* Fetch the public commit key:"
+msgstr "_* Obter a chave publica de commit:"
+
+#. type: Plain text
+#: en/about_manual.ssi:115
+#, no-wrap
+msgid ""
+"$ mkdir -p ~/.ssh/identity.d\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+msgstr ""
+"$ mkdir -p ~/.ssh/identity.d\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:119
+msgid "_* Add the following section to your openssh-client config:"
+msgstr "_* Adicione a seguinte sessão na configuração do seu openssh-client:"
+
+#. type: Plain text
+#: en/about_manual.ssi:128
+#, no-wrap
+msgid ""
+"$ cat >> ~/.ssh/config << EOF\n"
+"Host live.debian.net\n"
+"        Hostname live.debian.net\n"
+"        User gitosis\n"
+"        IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+"EOF\n"
+msgstr ""
+"$ cat >> ~/.ssh/config << EOF\n"
+"Host live.debian.net\n"
+"        Hostname live.debian.net\n"
+"        User gitosis\n"
+"        IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+"EOF\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:132
+msgid "_* Checkout a clone of the manual through ssh:"
+msgstr "_* Fazer o checkout de um clone do manual por ssh:"
+
+#. type: Plain text
+#: en/about_manual.ssi:136
+msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
+msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
+
+#. type: Plain text
+#: en/about_manual.ssi:140
+msgid ""
+"_* After editing the files in manual/en/, please call the 'commit' target in "
+"the top level directory to sanitize the files and update the translation "
+"files:"
+msgstr ""
+"_* Depoi de editar os arquivos no manual/en/, por favor chame o alvo "
+"'commit' no nível superior do diretório para higiênizar os arquivos e "
+"atualizar os arquivos de tradução.  "
+
+#. type: Plain text
+#: en/about_manual.ssi:144
+msgid "$ make commit"
+msgstr "$ make commit"
+
+#. type: Plain text
+#: en/about_manual.ssi:148
+msgid ""
+"_* After sanitizing commit the changes. Write commit messages, that consist "
+"of full useful sentences, starting with a capital letter and ending with a "
+"full stop. Usually starting with the form 'Fixing/Adding/Removing/"
+"Correcting/':"
+msgstr ""
+"_* Depois de higiênizar submeta as mudançãs. Escreva mensagens de submissão, "
+"que consistem em sentanças completas úteis, começando por letra maiuscula e "
+"acabando com uma parada total. Normalmente iniciando com as formas 'Fixing/"
+"Adding/Removing/Correcting/':"
+
+#. type: Plain text
+#: en/about_manual.ssi:152
+msgid "$ git commit -a"
+msgstr "$ git commit -a"
+
+#. type: Plain text
+#: en/about_manual.ssi:156
+msgid "_* Push the commit to the server:"
+msgstr "_* Enviar as submissões para os servidor."
+
+#. type: Plain text
+#: en/about_manual.ssi:160
+msgid "$ git push"
+msgstr "$ git push"
diff --git a/manual/po/de/about_project.ssi.po b/manual/po/pt_BR/about_project.ssi.po
similarity index 92%
copy from manual/po/de/about_project.ssi.po
copy to manual/po/pt_BR/about_project.ssi.po
index 3393dba..ee490b7 100644
--- a/manual/po/de/about_project.ssi.po
+++ b/manual/po/pt_BR/about_project.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,25 +6,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_project.ssi:2
 msgid ":B~ About the Debian Live Project"
-msgstr ":B~ Über das Debian Live Projekt"
+msgstr ""
 
 #. type: Plain text
 #: en/about_project.ssi:4
 msgid "1~ About the Debian Live Project"
-msgstr "1~ Über das Debian Live Projekt"
+msgstr ""
 
 #. type: Plain text
 #: en/about_project.ssi:6
@@ -192,20 +192,15 @@ msgstr ""
 #. type: Plain text
 #: en/about_project.ssi:60
 msgid ""
-"A system for configuring packages is provided using debconf in #{lh config}# "
+"A system for configuring packages is provided using debconf in #{lb config}# "
 "(use --preseed FILE) allowing custom configured packages to be installed in "
 "your custom produced Debian Live images, but for official live images only "
 "default configuration will be used. For more information, please see "
-"customization."
+"{Customization overview}#customization-overview."
 msgstr ""
 
 #. type: Plain text
 #: en/about_project.ssi:62
-msgid "% FIXME: <xref linkend=\"customization\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:64
 msgid ""
 "Exception: There are a few essential changes needed to bring a live system "
 "to life (e.g. configuring pam to allow empty passwords). These essential "
@@ -214,12 +209,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:66
-msgid "2~ Contact"
+#: en/about_project.ssi:64
+msgid "2~contact Contact"
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:68
+#: en/about_project.ssi:66
 msgid ""
 "_* *{Mailing list}*: The primary contact for the project is the mailing list "
 "at http://lists.debian.org/debian-live/. You can email the list directly by "
@@ -228,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:70
+#: en/about_project.ssi:68
 msgid ""
 "_* *{IRC}*: A number of users and developers are present in the #debian-live "
 "channel on irc.debian.org (OFTC). When asking a question on IRC, please be "
@@ -237,21 +232,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:72
+#: en/about_project.ssi:70
 msgid ""
 "_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
 "reported by users and developers. Each bug is given a number, and is kept on "
 "file until it is marked as having been dealt with. For more information, "
-"please see bugs."
-msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:74
-msgid "% FIXME: <xref linkend=\"bugs\"/>"
+"please see {Reporting bugs}#bugs."
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:75
+#: en/about_project.ssi:71
 msgid ""
 "_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
 "place to gather information, discuss applied technologies, and document "
diff --git a/manual/po/de/index.html.in.po b/manual/po/pt_BR/index.html.in.po
similarity index 63%
copy from manual/po/de/index.html.in.po
copy to manual/po/pt_BR/index.html.in.po
index 54a77a2..3217e51 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/pt_BR/index.html.in.po
@@ -1,55 +1,52 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
+# Brazilian Portuguese translations for live-manual package
+# 2010 Bruno Gurgel <bruno.gurgel at gmail.com>
+# This file is distributed under the same license as the live-config package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-manual 2.0~a3\n"
-"POT-Creation-Date: 2010-10-03 12:43+0300\n"
-"PO-Revision-Date: 2010-06-06 15:21+0300\n"
-"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
+"Project-Id-Version: live-manual 2.0~a8\n"
+"POT-Creation-Date: 2010-10-20 20:02+0300\n"
+"PO-Revision-Date: 2010-10-22 18:11-0300\n"
+"Last-Translator: Bruno Gurgel <bruno.gurgel at gmail.com>\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Content of: <html><head><title>
 #: en/index.html.in:4
 msgid "Debian Live Project"
-msgstr "Debian Live Projekt"
+msgstr "Projeto Debian Live"
 
 #. type: Content of: <html><body><h2>
 #: en/index.html.in:8
 msgid "Debian Live Manual"
-msgstr "Debian Live Handbuch"
+msgstr "Manual do Debian Live"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:11
 msgid "<i>This manual is under heavy construction.</i>"
-msgstr ""
-"<i>Dieses Handbuch ist noch nicht fertig und befindet sich im Aufbau.</i>"
+msgstr "<i>Esse manual está sobre constante contrução.</i>"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:15
 msgid ""
 "Please report errors, omissions, patches and suggestions to our mailinglist "
 "at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/meta.html#contributing\">how to "
-"contribute</a> to the manual."
+"org</a> and read about <a href=\"html/1.html#37\">how to contribute</a> to "
+"the manual."
 msgstr ""
-"Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste "
-"unter <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists."
-"debian.org</a> (englischspraching) gemeldet werden. Informationen wie man <a "
-"href=\"html/meta.html#contributing\">zum Handbuch beitragen</a> kann, können "
-"im Handbuch gefunden werden."
+"Por favor reporte erros, omissões, patches e sugestões para nossa lista de "
+"discussão em <a href=\"mailto:debian-live at lists.debian.org\">debian-"
+"live at lists.debian.org</a> e leia sobre <a href=\"html/1.html#37\">como "
+"contribuir</a> com o manual."
 
 #. type: Content of: <html><body><h3>
 #: en/index.html.in:18
 msgid "Available Formats"
-msgstr "Verfügbare Formate"
+msgstr "Formatos Disponíveis"
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:21
@@ -62,8 +59,8 @@ msgid ""
 "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
 "html\">single page</a>"
 msgstr ""
-"HTML: <a href=\"html/index.html\">mehrere Seiten</a>, <a href=\"html/live-"
-"manual.html\">einzelne Seite</a>"
+"HTML: <a href=\"html/index.html\">Páginas multiplas</a>, <a href=\"html/live-"
+"manual.html\">Página única</a>"
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:23
@@ -78,30 +75,30 @@ msgid ""
 "manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
 "landscape-letter.pdf\">letter landscape</a>"
 msgstr ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 Hochformat</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 Querformat</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">Letter Hochformat</a>, <a href=\"pdf/live-"
-"manual.landscape-letter.pdf\">Letter Querformat</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 retrato</a>, <a href="
+"\"pdf/live-manual.landscape-a4.pdf\">A4 paisagem</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.pdf\">US retrato</a>, <a href=\"pdf/live-manual."
+"landscape-letter.pdf\">US paisagem</a>"
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:25
 msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
-msgstr "<a href=\"txt/live-manual.txt\">Text</a>"
+msgstr "<a href=\"txt/live-manual.txt\">Texto plano</a>"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:29
 msgid "Last changed: @DATE_CHANGE@"
-msgstr "Letzte Änderung: @DATE_CHANGE@"
+msgstr "Última modificação: @DATE_CHANGE@"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:30
 msgid "Last built: @DATE_BUILD@"
-msgstr "Letzte Aktualisierung: @DATE_BUILD@"
+msgstr "Última contrução: @DATE_BUILD@"
 
 #. type: Content of: <html><body><h3>
 #: en/index.html.in:33
 msgid "Source"
-msgstr "Quellen"
+msgstr "Fonte"
 
 #. type: Content of: <html><body><p>
 #: en/index.html.in:36
@@ -109,8 +106,8 @@ msgid ""
 "The sources for this manual is available in a <a href=\"http://git.or.cz/"
 "\">git</a> repository at live.debian.net."
 msgstr ""
-"Die Quellen dieses Handbuches sind in einem <a href=\"http://git.or.cz/"
-"\">Git</a> Repository auf live.debian.net verfügbar."
+"O fonte desse manual está diponível em um repositório <a href=\"http://git."
+"or.cz/\">git</a> em live.debian.net."
 
 #. type: Content of: <html><body><ul><li>
 #: en/index.html.in:40
@@ -119,7 +116,7 @@ msgid ""
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
 "a>"
 msgstr ""
-"Browse: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
+"Navegue: <a href=\"http://live.debian.net/gitweb/?p=live-manual.git"
 "\"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></"
 "a>"
 
@@ -141,4 +138,4 @@ msgid ""
 msgstr ""
 "<a href=\"http://live.debian.net/\">Debian Live</a> &lt;<a href=\"mailto:"
 "debian-live at lists.debian.org\">debian-live at lists.debian.org</a>&gt; - <a "
-"href=\"http://live.debian.net/legal.html\">Rechtliche Hinweise</a>"
+"href=\"http://live.debian.net/legal.html\">Aviso legal</a>"
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
similarity index 70%
copy from manual/po/de/live-manual.ssm.po
copy to manual/po/pt_BR/live-manual.ssm.po
index bb7f289..22c7880 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,15 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-25 23:12+0300\n"
+"PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:2
@@ -24,7 +24,7 @@ msgstr ""
 #. type: Plain text
 #: en/live-manual.ssm:4
 msgid "@title: Debian Live Manual"
-msgstr "@title: Debian Live Handbuch"
+msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:6
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-10-03\n"
+" :published: 2010-10-25\n"
 msgstr ""
 
 #. type: Plain text
@@ -58,7 +58,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@make:\n"
-" :bold: /lenny|stable|squeeze|testing|sid|unstable/\n"
+" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
 " :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
 " :num_top: 1\n"
 " :skin: skin_debian-live\n"
@@ -106,110 +106,130 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:39
-msgid "<< user_customization-packages.ssi"
+msgid "<< user_managing_a_configuration.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:41
-msgid "<< user_customization-contents.ssi"
+msgid "<< user_customization-overview.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:43
-msgid ":B~ Development ~#"
+msgid "<< user_customization-packages.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:45
-msgid ":B~ Project ~#"
+msgid "<< user_customization-contents.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid ":B~ Other ~#"
+msgid "<< user_customization-internationalization.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid "<< other_customization-internationalization.ssi"
+msgid ":B~ Development ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:51
-msgid "<< other_customization-bootup.ssi"
+msgid ":B~ Project ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:53
-msgid "<< other_customization-binary.ssi"
+msgid "<< project_bugs.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
-msgid "<< other_customization-backports.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:57
-msgid "<< other_common-tasks.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:59
-msgid "<< other_live-environment.ssi"
+msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:61
-msgid "<< other_faq.ssi"
+msgid ""
+"Other material that formerly appeared in this section is out of date and/or "
+"has not been approved for release. It has therefore been omitted, but can "
+"still be found in the document source; see 'About this manual'. Any part of "
+"the omitted material that is still useful will be included in the release "
+"only after it has been reviewed."
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:63
-msgid "<< other_reporting-bugs.ssi"
+msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:65
-msgid "<< other_howtos.ssi"
+msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:67
-msgid "<< other_coding-style.ssi"
+msgid "% << other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:69
-msgid "<< other_procedures.ssi"
+msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:71
-msgid "<< other_resources.ssi"
+msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:73
-msgid "<< other_use-cases.ssi"
+msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:75
-msgid "<< other_success-stories.ssi"
+msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:77
-msgid "<< other_troubleshooting.ssi"
+msgid "% << other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:79
-msgid "<< other_configuration-layout.ssi"
+msgid "% << other_procedures.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:81
+msgid "% << other_resources.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:83
+msgid "% << other_use-cases.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:85
+msgid "% << other_success-stories.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:87
+msgid "% << other_troubleshooting.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:89
+msgid "% << other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:80
-msgid "<< other_configuration-files.ssi"
+#: en/live-manual.ssm:90
+msgid "% << other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/po/de/other_coding-style.ssi.po b/manual/po/pt_BR/other_coding-style.ssi.po
similarity index 98%
copy from manual/po/de/other_coding-style.ssi.po
copy to manual/po/pt_BR/other_coding-style.ssi.po
index 81ab20f..f1e0e44 100644
--- a/manual/po/de/other_coding-style.ssi.po
+++ b/manual/po/pt_BR/other_coding-style.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +72,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +129,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_coding-style.ssi:2
diff --git a/manual/po/de/other_common-tasks.ssi.po b/manual/po/pt_BR/other_common-tasks.ssi.po
similarity index 60%
copy from manual/po/de/other_common-tasks.ssi.po
copy to manual/po/pt_BR/other_common-tasks.ssi.po
index 10396a9..2c13b2b 100644
--- a/manual/po/de/other_common-tasks.ssi.po
+++ b/manual/po/pt_BR/other_common-tasks.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,95 +6,92 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,31 +102,39 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_common-tasks.ssi:2
@@ -190,7 +195,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_common-tasks.ssi:18
 msgid ""
-"This whole process can be preseeded and customised in a number of ways; see "
+"This whole process can be preseeded and customized in a number of ways; see "
 "the relevant \"DebianInstaller\" wiki page and installation guide for more. "
 "This is operational now withing live-helper."
 msgstr ""
diff --git a/manual/po/de/other_configuration-files.ssi.po b/manual/po/pt_BR/other_configuration-files.ssi.po
similarity index 99%
copy from manual/po/de/other_configuration-files.ssi.po
copy to manual/po/pt_BR/other_configuration-files.ssi.po
index 8c1ca55..e0d93fb 100644
--- a/manual/po/de/other_configuration-files.ssi.po
+++ b/manual/po/pt_BR/other_configuration-files.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/other_configuration-files.ssi:2
diff --git a/manual/po/de/other_configuration-layout.ssi.po b/manual/po/pt_BR/other_configuration-layout.ssi.po
similarity index 97%
copy from manual/po/de/other_configuration-layout.ssi.po
copy to manual/po/pt_BR/other_configuration-layout.ssi.po
index ad61482..24b6391 100644
--- a/manual/po/de/other_configuration-layout.ssi.po
+++ b/manual/po/pt_BR/other_configuration-layout.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/other_configuration-layout.ssi:2
diff --git a/manual/pot/other_customization-internationalization.ssi.pot b/manual/po/pt_BR/other_customization-backports.ssi.po
similarity index 72%
rename from manual/pot/other_customization-internationalization.ssi.pot
rename to manual/po/pt_BR/other_customization-backports.ssi.po
index 651607e..bec4c76 100644
--- a/manual/pot/other_customization-internationalization.ssi.pot
+++ b/manual/po/pt_BR/other_customization-backports.ssi.po
@@ -1,20 +1,20 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Portuguese translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# Automatically generated, 2010.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
 "POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +72,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,95 +129,36 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:2
-msgid "B~ Customising Locale And Language"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
-#: en/other_customization-internationalization.ssi:4
-msgid "1~ Customising Locale And Language"
+#: en/other_customization-backports.ssi:2
+msgid "B~ Using a newer kernel with Lenny"
 msgstr ""
 
 #. type: Plain text
-#: en/other_customization-internationalization.ssi:6
-msgid "2~ Default locale and keyboard"
+#: en/other_customization-backports.ssi:4
+msgid "1~ Using a newer kernel with Lenny"
 msgstr ""
 
 #. type: Plain text
-#: en/other_customization-internationalization.ssi:8
+#: en/other_customization-backports.ssi:6
 msgid ""
-"The default locale when building a live cd is \"locale=en_US.UTF-8\". To set "
-"the locale for the UK (locale=en_GB.UTF-8)"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:12
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:16
-msgid "The entry for a British keyboard would be"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:20
-msgid "$ lh_config --bootappend-live \"keyb=uk\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:24
-msgid ""
-"To configure both the locale and the keyboard for the UK the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:28
-msgid "$ lh_config --bootappend-live \"locale=en_GB.UTF-8 keyb=uk\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:32
-#: en/user_installation.ssi:44
-msgid "or"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:36
-msgid "$ lh_config --bootappend-live \"locale=uk\""
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:40
-msgid ""
-"Note: You can find a list of options in the manpage for live-initramfs. Only "
-"UTF8 locales are supported by live-initramfs."
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:42
-msgid "2~ l10n Packages"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:44
-msgid ""
-"lh build can automatically check for each package, for which it's know that "
-"there are -l10n packages available and install them. To add Swedish packages "
-"the entry would be"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:48
-msgid "$ lh_config --language \"se\""
+"The backports repository, backports.org, lacks the necessary module packages "
+"(linux-modules-extra-2.6, aufs, etc.) so an alternative repository has been "
+"set up, in order to build Lenny live images with a later kernel. Shown here "
+"is one way of doing it."
 msgstr ""
 
 #. type: Plain text
-#: en/other_customization-internationalization.ssi:51
+#: en/other_customization-backports.ssi:15
 msgid ""
-"This will also change the default syslinux language if #{config/templates/"
-"syslinux/se}# is available. Check syslinux configuration FIXME"
+"$ lh_config --linux-packages 'linux-image-2.6 aufs-modules-2.6' $ echo 'deb "
+"http://unsupported.debian-maintainers.org/backports-kernel/ ./' > config/"
+"chroot_sources/backports-kernel.chroot $ echo 'deb http://unsupported.debian-"
+"maintainers.org/backports-kernel/ ./' > config/chroot_sources/backports-"
+"kernel.binary $ wget http://unsupported.debian-maintainers.org/backports-"
+"kernel/archive-key.asc -O config/chroot_sources/backports-kernel.chroot.gpg "
+"$ wget http://unsupported.debian-maintainers.org/backports-kernel/archive-"
+"key.asc -O config/chroot_sources/backports-kernel.binary.gpg # lh_build"
 msgstr ""
diff --git a/manual/po/de/other_customization-binary.ssi.po b/manual/po/pt_BR/other_customization-binary.ssi.po
similarity index 88%
copy from manual/po/de/other_customization-binary.ssi.po
copy to manual/po/pt_BR/other_customization-binary.ssi.po
index 18724ed..005c9fd 100644
--- a/manual/po/de/other_customization-binary.ssi.po
+++ b/manual/po/pt_BR/other_customization-binary.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,24 +6,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/other_customization-binary.ssi:2
-msgid "B~ Customising the binary image"
+msgid "B~ Customizing the binary image"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-binary.ssi:4
-msgid "1~ Customising the binary image<"
+msgid "1~ Customizing the binary image<"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/other_customization-bootup.ssi.po b/manual/po/pt_BR/other_customization-bootup.ssi.po
similarity index 58%
copy from manual/po/de/other_customization-bootup.ssi.po
copy to manual/po/pt_BR/other_customization-bootup.ssi.po
index 360517d..336c264 100644
--- a/manual/po/de/other_customization-bootup.ssi.po
+++ b/manual/po/pt_BR/other_customization-bootup.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,95 +6,92 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,46 +102,54 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:2
-msgid "B~ Customising the bootup process"
+msgid "B~ Customizing the bootup process"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:4
-msgid "1~ Customising the bootup process"
+msgid "1~ Customizing the bootup process"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:6
 msgid ""
-"This chapter discusses customisation of bootup process of a live system, "
+"This chapter discusses customization of bootup process of a live system, "
 "including kernel options, modifications to the bootloader, \"splash\" "
 "screens and startup scripts."
 msgstr ""
diff --git a/manual/po/de/other_faq.ssi.po b/manual/po/pt_BR/other_faq.ssi.po
similarity index 87%
copy from manual/po/de/other_faq.ssi.po
copy to manual/po/pt_BR/other_faq.ssi.po
index de35d69..0715d80 100644
--- a/manual/po/de/other_faq.ssi.po
+++ b/manual/po/pt_BR/other_faq.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,95 +6,92 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,31 +102,39 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_faq.ssi:2
@@ -466,7 +471,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_faq.ssi:163
 msgid ""
-"Q: How do I add software not in Debian ? A: See Customising package "
+"Q: How do I add software not in Debian ? A: See Customizing package "
 "installation % FIXME: <xref linkend=\"packages\"/>"
 msgstr ""
 
@@ -643,7 +648,7 @@ msgstr ""
 #: en/other_faq.ssi:234
 msgid ""
 "Q: How do I get past boot prompt without a working keyboard? A: See "
-"Customising the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
+"Customizing the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
 "Boot from an USB-HDD on an iMac with GRUB did not work."
 msgstr ""
 
diff --git a/manual/po/de/other_howtos.ssi.po b/manual/po/pt_BR/other_howtos.ssi.po
similarity index 98%
copy from manual/po/de/other_howtos.ssi.po
copy to manual/po/pt_BR/other_howtos.ssi.po
index d98d7ea..5217e74 100644
--- a/manual/po/de/other_howtos.ssi.po
+++ b/manual/po/pt_BR/other_howtos.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +72,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +129,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_howtos.ssi:2
diff --git a/manual/po/de/other_live-environment.ssi.po b/manual/po/pt_BR/other_live-environment.ssi.po
similarity index 99%
copy from manual/po/de/other_live-environment.ssi.po
copy to manual/po/pt_BR/other_live-environment.ssi.po
index fea7cfb..b45dbfa 100644
--- a/manual/po/de/other_live-environment.ssi.po
+++ b/manual/po/pt_BR/other_live-environment.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +72,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +129,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
diff --git a/manual/po/de/other_procedures.ssi.po b/manual/po/pt_BR/other_procedures.ssi.po
similarity index 98%
copy from manual/po/de/other_procedures.ssi.po
copy to manual/po/pt_BR/other_procedures.ssi.po
index 3858198..4a19a37 100644
--- a/manual/po/de/other_procedures.ssi.po
+++ b/manual/po/pt_BR/other_procedures.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +72,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +129,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_procedures.ssi:2
@@ -335,7 +335,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_procedures.ssi:91
 msgid "Debian Live project homepage:"
-msgstr "Debian Live Projekt Homepage:"
+msgstr ""
 
 #. type: Plain text
 #: en/other_procedures.ssi:93
diff --git a/manual/po/de/other_resources.ssi.po b/manual/po/pt_BR/other_resources.ssi.po
similarity index 95%
copy from manual/po/de/other_resources.ssi.po
copy to manual/po/pt_BR/other_resources.ssi.po
index ebfbb80..aa97c31 100644
--- a/manual/po/de/other_resources.ssi.po
+++ b/manual/po/pt_BR/other_resources.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
diff --git a/manual/po/de/other_success-stories.ssi.po b/manual/po/pt_BR/other_success-stories.ssi.po
similarity index 91%
copy from manual/po/de/other_success-stories.ssi.po
copy to manual/po/pt_BR/other_success-stories.ssi.po
index c88b9e3..6cd6d26 100644
--- a/manual/po/de/other_success-stories.ssi.po
+++ b/manual/po/pt_BR/other_success-stories.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
diff --git a/manual/po/de/other_troubleshooting.ssi.po b/manual/po/pt_BR/other_troubleshooting.ssi.po
similarity index 91%
copy from manual/po/de/other_troubleshooting.ssi.po
copy to manual/po/pt_BR/other_troubleshooting.ssi.po
index 05185bd..9730c48 100644
--- a/manual/po/de/other_troubleshooting.ssi.po
+++ b/manual/po/pt_BR/other_troubleshooting.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/other_troubleshooting.ssi:2
diff --git a/manual/po/de/other_use-cases.ssi.po b/manual/po/pt_BR/other_use-cases.ssi.po
similarity index 98%
copy from manual/po/de/other_use-cases.ssi.po
copy to manual/po/pt_BR/other_use-cases.ssi.po
index 172dd6e..1931155 100644
--- a/manual/po/de/other_use-cases.ssi.po
+++ b/manual/po/pt_BR/other_use-cases.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,11 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +72,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +129,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
diff --git a/manual/po/pt_BR/project_bugs.ssi.po b/manual/po/pt_BR/project_bugs.ssi.po
new file mode 100644
index 0000000..a69dabe
--- /dev/null
+++ b/manual/po/pt_BR/project_bugs.ssi.po
@@ -0,0 +1,491 @@
+# Portuguese translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"PO-Revision-Date: 2010-10-25 23:27+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/project_bugs.ssi:58 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:224 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:38
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
+#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
+#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
+#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
+#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_bugs.ssi:2
+msgid "B~ Reporting bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:4
+msgid "1~bugs Reporting bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:6
+msgid ""
+"Debian Live is far from being perfect, but we want to make it as close as "
+"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"better to fill a report twice than never. However, this chapter includes "
+"recommendations how to file good bug reports."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:8
+msgid "For the impatient:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:10
+msgid ""
+"_* Always check first the image status updates on our homepage at http://"
+"live.debian.net/ for known issues."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:12
+msgid ""
+"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
+"build, live-boot, and live-config before submitting a bug report."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:14
+msgid ""
+"_* Try to give *{as specific information as possible}* about the bug. This "
+"includes (at least) the version of live-build, live-boot, and live-config "
+"used and the distribution of the live system you are building."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:16
+msgid "2~ Known issues"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:18
+msgid ""
+"Due to the nature of Debian testing and Debian unstable distributions being "
+"a moving target, building a live system may not always be possible."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:20
+msgid ""
+"If this is a problem, do not build a system based on testing or unstable, "
+"but go with stable. live-build does always default to the current stable "
+"release."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:22
+msgid ""
+"Currently known issues are listed under the section 'status' on our homepage "
+"at http://live.debian.net/"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:24
+msgid ""
+"It is out of the scope of this manual to train you in correctly identifying "
+"and fixing problems in packages of the development distributions, however, "
+"there are two things you can always try: When not succeeding to build "
+"testing, try if unstable works. If unstable does not work either, revert to "
+"testing and pinning the newer version of the failing package from unstable."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:26
+msgid "2~ Rebuild from scratch"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:28
+msgid ""
+"To ensure that a particular bug is not caused by an unclean built system, "
+"please always rebuild the whole live system from scratch to see if the bug "
+"is reproducible."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:30
+msgid "2~ Use up-to-date packages"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:32
+msgid ""
+"Using outdated packages can cause significant problems when trying to "
+"reproduce (and ultimately fix) your problem."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:34
+msgid "2~collect-information Collect information"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:36
+msgid ""
+"Please provide enough information with your report. At a minimum, it should "
+"contain the exact version of live-build version where the bug is "
+"encountered, and steps to reproduce it. Please use common sense and include "
+"other relevant information if you think that it might help in solving the "
+"problem."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:38
+msgid ""
+"To make the most out of your bug report, we require at least the following "
+"information:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:40
+msgid "_* Architecture of the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:42
+msgid "_* Version of live-build on the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:44
+msgid "_* Version of live-boot on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:46
+msgid "_* Version of live-config on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:48
+msgid "_* Version of debootstrap and/or cdebootstrap on the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:50
+msgid "_* Architecture of the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
+msgid "_* Distribution of the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:54
+msgid "_* Version of the kernel on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:56
+msgid "You can generate a log of the build process by using the tee command:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:60
+msgid "lb build 2>&1 | tee build.log"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:64
+msgid ""
+"Additionally, to rule out other errors, it is always a good idea to tar up "
+"your config directory and upload it somewhere (do *{not}* send it as an "
+"attachment to the mailinglist), so that we can try to reproduce the errors "
+"you encountered."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:66
+msgid ""
+"Remember to send in any logs that were produced with English locale "
+"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
+"{LC_ALL=en_US}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:68
+msgid "2~ Use the correct package to report the bug against"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:70
+msgid "Where does the bug appear?"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:72
+msgid "3~ At build time whilst bootstrapping"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:74
+msgid ""
+"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
+"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"distribution it is bootstrapping, it may fail. If a bug appears here, check "
+"if the error is related to a specific Debian package (most likely), or if it "
+"is related to bootstrapping tool itself."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:76
+msgid ""
+"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
+"which we can not fix this directly. Please report such a bug against the "
+"bootstrapping tool or the failing package."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:78
+msgid "3~ At build time whilst installing packages"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:80
+msgid ""
+"live-build installs additional packages from the Debian archive and "
+"depending on the Debian distribution used and the daily archive state, it "
+"can fail. If a bug appears here, check if the error is also reproducible on "
+"a normal system."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:82
+msgid ""
+"If this is the case, this is not a bug in Debian Live, but rather in Debian "
+"- please report it against the failing package. Running debootstrap "
+"seperately from the Live system build or running lb bootstrap with #{--debug}"
+"# will give you more information."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
+msgid ""
+"Also, if you are using a local mirror and/or any of sort of proxy and you "
+"are experiencing a problem, please always reproduce it first by "
+"bootstrapping from an official mirror."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:86
+msgid "3~ At boot-time"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:88
+msgid ""
+"If your image does not boot, please report it to the mailing list together "
+"with the information requested in {Collect information}#collect-information. "
+"Do not forget to mention, how/when the image failed, in Qemu, VMWare or real "
+"hardware. If you are using a virtualization technology of any kind, please "
+"always run it on real hardware before reporting a bug. Providing a "
+"screenshot of the failure is also very helpful."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:90
+msgid "3~ At run-time"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:92
+msgid ""
+"If a package was successfully installed, but fails while actually running "
+"the Live system, this is probably a bug in Debian Live. However,"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:94
+msgid "2~ Do the research"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:96
+msgid ""
+"Before filing the bug, please search the web for the particular error "
+"message or symptom you are getting. As it is highly unlikely that you are "
+"the only person experiencing a particular problem, there is always a chance "
+"that it has been discussed elsewhere, and a possible solution, patch, or "
+"workaround has been proposed."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:98
+msgid ""
+"You should pay particular attention to the Debian Live mailing list, as well "
+"as the homepage, as these are likely to contain the most up-to-date "
+"information. If such information exists, always include the references to it "
+"in your bug report."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:100
+msgid ""
+"In addition, you should check the current bug lists for live-build, live-"
+"boot, and live-config to see whether something similar has been reported "
+"already."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:102
+msgid "2~ Where to report bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:104
+msgid ""
+"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
+"System (BTS). For information on how to use the system, please see http://"
+"bugs.debian.org/. You can also submit the bugs by using the #{reportbug}# "
+"command from the package with the same name."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:106
+msgid ""
+"In general, you should report build time errors against the live-build "
+"package, boot time errors against live-boot, and run time errors against "
+"live-config. If you are unsure of which package is appropriate or need more "
+"help before submitting a bug report, please send a message to the mailing "
+"list and we will help you to figure it out."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:107
+msgid ""
+"Please note that bugs found in distributions derived from Debian (such as "
+"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
+"can be also reproduced on a Debian system using official Debian packages."
+msgstr ""
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
similarity index 73%
copy from manual/po/de/user_basics.ssi.po
copy to manual/po/pt_BR/user_basics.ssi.po
index e8d344f..6c3300c 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-20 06:53-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,32 +101,40 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_basics.ssi:2
@@ -159,17 +164,11 @@ msgid ""
 "A live system usually means an operating system booted on a computer from a "
 "removable medium (such as CD-ROM, USB stick, or network), ready to use "
 "without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see terms)."
+"done at runtime (see {Terms}#terms )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:14
+#: en/user_basics.ssi:12
 msgid ""
 "With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
 "the supported architectures (currently amd64, i386, powerpc and sparc). It "
@@ -177,17 +176,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:16
+#: en/user_basics.ssi:14
 msgid "_* Linux kernel"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:18
+#: en/user_basics.ssi:16
 msgid "_* The Linux image, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
 msgid ""
 "_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
 "containing modules possibly needed to mount the filesystem's image and some "
@@ -195,10 +194,10 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
 msgid ""
-"_* *{System image}*: The operating systems filesystem image. Debian Live "
-"uses SquashFS, a compressed filesystem, to minimize its image size. Note "
+"_* *{System image}*: The operating systems filesystem image. The SquashFS "
+"compressed filesystem is used to minimize the Debian Live image size. Note "
 "that it's read-only. So, during boot the Debian Live system will use a RAM "
 "disk and 'union' mechanism to enable writing files within the running "
 "system. However, all modifications will be lost upon shutdown unless "
@@ -206,12 +205,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid "% FIXME: <xref linkend=\"persistence\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid ""
 "_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -225,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "_* live-build will build the system image from your specifications, setup a "
 "Linux kernel and its initrd, a bootloader to run them, all in one media-"
@@ -233,12 +232,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
 msgid ""
 "The following sequence of commands, provided by live-build, will create a "
 "basic ISO image containing just the Debian standard system without X.org. It "
@@ -246,129 +245,135 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
 msgid ""
 "By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see lb-config)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
+"the defaults (see {The lb config command}#lb-config )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:46
+#: en/user_basics.ssi:42
 msgid ""
 "Now that we have a \"config/\" hierarchy, we may build the image with the lb "
 "build command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50 en/user_basics.ssi:122 en/user_basics.ssi:204
+#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:50
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see lb-build)."
+"connection (see {The lb build command}#lb-build )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:52
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:54
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64 en/user_basics.ssi:144
+#: en/user_basics.ssi:58 en/user_basics.ssi:146
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:60
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:64
 msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:66
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:70
 msgid "# apt-get install virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:74
 msgid ""
 "and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
 "build the required kernel modules to run virtualbox-ose."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:82
+#: en/user_basics.ssi:76
 msgid ""
 "After successful installation, virtualbox can be e.g. found in the GNOME "
 "menu under 'Applications/System Tools/VirtualBox OSE'."
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:78
+msgid ""
+"Please consider including of following packages onto the live image to "
+"achieve higher resolution of the display when booting the live image in "
+"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
+"default resolution of the virtualbox-ose display shouldn't work with the gui-"
+"installer)."
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:84
+msgid ""
+"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:88
 msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:90
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:94
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:96
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:100
 msgid "2~ Building an USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:102
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -377,46 +382,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:104
 msgid ""
 "Note if you created an iso image with the previous example, you will need to "
-"clean up your working directory with the #{lb clean} command (see lb-clean):"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:102
-msgid "% FIXME: <xref linkend=\"lb-clean\"/>"
+"clean up your working directory with the #{lb clean} command (see {The lb "
+"clean command}#lb-clean ):"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:106 en/user_basics.ssi:186
+#: en/user_basics.ssi:108 en/user_basics.ssi:188
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:112
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:114
+#: en/user_basics.ssi:116
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:118
+#: en/user_basics.ssi:120
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:128
 msgid "3~ Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:130
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on an USB stick. Plug in an USB "
@@ -424,12 +425,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:132
+#: en/user_basics.ssi:134
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:138
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -437,28 +438,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:140
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:142
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:148
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:154
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -467,45 +468,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:158
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:162
 msgid ""
 "Ater the creation of the partition you have to create a filsystem on it. One "
 "possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
+#: en/user_basics.ssi:166
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:170
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
+#: en/user_basics.ssi:174
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:178
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -513,28 +514,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:184
 msgid ""
 "Note if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:192
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
+#: en/user_basics.ssi:196
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
 msgid ""
 "In contrast with the ISO and USB hdd images, netbooting does not support "
 "serving a filesystem image with the client so the files must be served via "
@@ -544,12 +545,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:202
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
 msgid ""
 "In a network boot the client runs a small piece of software, which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -560,7 +561,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
@@ -569,17 +570,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the computer netbooting, and to advertise the location of the PXE "
@@ -587,25 +588,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:220
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
 "dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:226
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:229
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -613,7 +614,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:232
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -621,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -631,7 +632,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:241
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -640,7 +641,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:244
 #, no-wrap
 msgid ""
 "    # PXE boot loader (first program to be loaded, by TFTP)\n"
@@ -648,7 +649,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:247
 #, no-wrap
 msgid ""
 "  }\n"
@@ -656,17 +657,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
 msgid "This serves the kernel and initial ramdisk to the system at run-time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:255
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
 "inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -674,27 +675,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
-msgid "dpkg-reconfigure -plow tftpd-hpa"
-msgstr ""
-
-#. type: Plain text
 #: en/user_basics.ssi:259
-msgid "code}"
+msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -702,35 +698,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:271
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:275
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:279
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:283
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -739,40 +735,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:291
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:299
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:310
 msgid ""
 "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
 "\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -781,62 +777,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:324
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:332
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:338
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:341
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:344
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:349
 msgid ""
 "ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
 "83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -844,19 +840,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:355
 msgid ""
 "_* Double click on this file (or run VMWare player and selecet this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:356
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/pt_BR/user_customization-contents.ssi.po
similarity index 66%
copy from manual/po/de/user_customization-contents.ssi.po
copy to manual/po/pt_BR/user_customization-contents.ssi.po
index be9ddad..11c52cf 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/pt_BR/user_customization-contents.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,52 +101,54 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:2
-msgid "B~ Customising contents"
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid "B~ Customizing contents"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:4
-msgid "1~ Customising contents"
+msgid "1~customizing-contents Customizing contents"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:6
-msgid "This chapter discusses further customisation of the live system."
+msgid "This chapter discusses further customization of the live system."
 msgstr ""
 
 #. type: Plain text
@@ -210,6 +209,11 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+#: en/user_customization-contents.ssi:26
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-contents.ssi:28
 msgid "3~ Live/chroot local includes"
 msgstr ""
diff --git a/manual/po/pt_BR/user_customization-internationalization.ssi.po b/manual/po/pt_BR/user_customization-internationalization.ssi.po
new file mode 100644
index 0000000..b6d9fb5
--- /dev/null
+++ b/manual/po/pt_BR/user_customization-internationalization.ssi.po
@@ -0,0 +1,218 @@
+# Portuguese translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"PO-Revision-Date: 2010-10-22 08:57-0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:2
+msgid "B~ Customizing locale and language"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:4
+msgid "1~customizing-locale-and-language Customizing locale and language"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:6
+msgid "2~ Default locale and keyboard"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:8
+msgid ""
+"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
+"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:12
+msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:16
+msgid "The entry for a Swiss-German keyboard would be:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:20
+msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:24
+msgid "Combined, the keyboard and locale configured for Switzerland would be:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:28
+msgid ""
+"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:32
+msgid ""
+"Note: You can find a list of options in the manpage for live-config. "
+"Currently, only UTF-8 locales are supported."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:34
+msgid "2~ l10n Packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:36
+msgid ""
+"An experimental feature of live-build is to automatically check for each "
+"package for which it is know that there are -l10n packages available and "
+"install them. To add German packages the entry would be"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:40
+msgid "$ lb config --language \"de\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:43
+msgid ""
+"This will also change the default syslinux language if translations are "
+"available or local translations have been put into #{config/templates/"
+"syslinux/de}#."
+msgstr ""
diff --git a/manual/po/pt_BR/user_customization-overview.ssi.po b/manual/po/pt_BR/user_customization-overview.ssi.po
new file mode 100644
index 0000000..fa980d5
--- /dev/null
+++ b/manual/po/pt_BR/user_customization-overview.ssi.po
@@ -0,0 +1,44 @@
+# Portuguese translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"PO-Revision-Date: 2010-10-22 08:57-0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid "B~ Customizing contents"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:4
+msgid "1~customization-overview Customization overview"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:7
+msgid ""
+"% FIXME: just a stub for now.  In conversational style, cover the different "
+"kinds of customization % and link to each section within the text."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:9
+msgid ""
+"This chapter gives an overview of the various ways in which your Debian live "
+"systems may be customized. See sections {Customizing package installation}"
+"#customizing-package-installation, {Customizing contents}#customizing-"
+"contents and {Customizing locale and language}#customizing-locale-and-"
+"language."
+msgstr ""
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
similarity index 77%
copy from manual/po/de/user_customization-packages.ssi.po
copy to manual/po/pt_BR/user_customization-packages.ssi.po
index e2d0159..143ae89 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 08:58-0200\n"
+"PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,45 +102,53 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
-#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+#: en/user_basics.ssi:230 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:2
-msgid ":B~ Customising package installation"
+msgid ":B~ Customizing package installation"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:4
-msgid "1~ Customising package installation"
+msgid "1~customizing-package-installation Customizing package installation"
 msgstr ""
 
 #. type: Plain text
@@ -461,16 +466,39 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:145
 #, no-wrap
+msgid "*{Local binary packages lists}*\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:147
+msgid ""
+"In case you want to include some required .deb packages to live media's "
+"pool/ (without installing them onto the live image) you may need to use "
+"lists using binary local package lists stored in #{config/binary_local-"
+"packageslists}#. Such media can be used as a customized debian install image "
+"for offline installations."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:149
+msgid ""
+"Package lists that exist in this directory need to have a .list suffix in "
+"order to be processed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:151
+#, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:160
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:162
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -478,75 +506,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:164
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:170
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:174
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:180
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:184
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:190
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:194
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:200
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:198
+#: en/user_customization-packages.ssi:204
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
 "in this way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:200
+#: en/user_customization-packages.ssi:206
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:202
+#: en/user_customization-packages.ssi:208
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:210
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:212
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:214
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -557,7 +585,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:216
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -568,35 +596,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:218
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:220
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:222
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:224
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
-"\" customisations but has a number of drawbacks, whilst using a custom APT "
+"\" customizations but has a number of drawbacks, whilst using a custom APT "
 "repository is more time-consuming to set up."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:226
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:228
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -605,45 +633,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:230
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:232
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:234
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:236
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:238
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:240
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:242
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -651,12 +679,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:244
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:246
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -664,12 +692,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:248
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:250
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -679,7 +707,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:252
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -689,17 +717,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:254
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:256
 msgid "3~ Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:257
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/pt_BR/user_installation.ssi.po
similarity index 61%
copy from manual/po/de/user_installation.ssi.po
copy to manual/po/pt_BR/user_installation.ssi.po
index 5e0e898..042d164 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/pt_BR/user_installation.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-16 20:36-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,44 +101,40 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:32
-#: en/user_installation.ssi:44
-msgid "or"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_installation.ssi:2
@@ -243,6 +236,11 @@ msgid "# apt-get install live-build"
 msgstr ""
 
 #. type: Plain text
+#: en/user_installation.ssi:44
+msgid "or"
+msgstr ""
+
+#. type: Plain text
 #: en/user_installation.ssi:48
 msgid "# aptitude install live-build"
 msgstr ""
@@ -296,17 +294,17 @@ msgid "and uninstall it with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:87
-msgid "# make uninstall }code"
+#: en/user_installation.ssi:86
+msgid "# make uninstall"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:89
+#: en/user_installation.ssi:90
 msgid "3~ From 'snapshots'"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:91
+#: en/user_installation.ssi:92
 msgid ""
 "If you do not wish to build or install live-build from source, you can use "
 "snapshots. These are built automatically from the latest version in Git and "
@@ -314,45 +312,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:93
+#: en/user_installation.ssi:94
 msgid "2~ live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:95
+#: en/user_installation.ssi:96
 #, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customised Debian Live systems. However, doing so will do no harm.\n"
+msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:97
-msgid "3~ Using a customised live-boot"
+#: en/user_installation.ssi:98
+msgid "3~ Using a customized live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:99
+#: en/user_installation.ssi:100
 msgid ""
 "To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in terms."
+"familiar with the terms mentioned in {Terms}#terms ."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:103
+#: en/user_installation.ssi:102
 msgid "_* Checkout the live-boot source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:107
+#: en/user_installation.ssi:106
 msgid "$ git clone git://live.debian.net/git/live-boot.git"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:111
+#: en/user_installation.ssi:110
 msgid "_* Make changes to your local copy"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:113
+#: en/user_installation.ssi:112
 msgid ""
 "And beware that if you want to add your pre-init script in live-bottom, you "
 "should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -360,33 +358,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:115
+#: en/user_installation.ssi:114
 msgid "_* Build a live-boot .deb"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:117
+#: en/user_installation.ssi:116
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is squeeze then you should "
-"build against squeeze. You can use a personal builder such as /{pbuilder}/ "
+"your target platform: this means if your target is Squeeze then you should "
+"build against Squeeze. You can use a personal builder such as /{pbuilder}/ "
 "or /{sbuild}/ to automate building packages in chroot. To build directly on "
 "the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ "
 "package):"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:121
 msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:126
+#: en/user_installation.ssi:125
 msgid "_* Use the generated live-boot .deb"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:128
+#: en/user_installation.ssi:127
 msgid ""
 "As live-boot is installed by live-build system, installing the package in "
 "the host system is not sufficient: you should treat the generated .deb like "
@@ -395,19 +393,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:130
+#: en/user_installation.ssi:129
 msgid ""
 "% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
 "apt\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:132
+#: en/user_installation.ssi:131
 msgid "3~ Using live-boot snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:134
+#: en/user_installation.ssi:133
 msgid ""
 "You can let live-build automatically use the latest snapshot of live-boot by "
 "configuring a third-party repository in your live-build configuration "
@@ -416,6 +414,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:138
+#: en/user_installation.ssi:137
 msgid "lb config --repository live.debian.net"
 msgstr ""
diff --git a/manual/po/pt_BR/user_managing_a_configuration.ssi.po b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
new file mode 100644
index 0000000..010cb70
--- /dev/null
+++ b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
@@ -0,0 +1,268 @@
+# Portuguese translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-13 17:00+0300\n"
+"PO-Revision-Date: 2010-10-13 17:00+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:88 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:2
+msgid ":B~ Managing a configuration"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:4
+msgid "1~ Managing a configuration"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:6
+msgid ""
+"This chapter explains how to manage a live configuration from initial "
+"creation, through successive revisions and successive releases of both the "
+"live-build software and the live image itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:8
+msgid "2~ Use auto to manage configuration changes"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:10
+msgid ""
+"Live configurations rarely are perfect on the first try. You'll likely need "
+"to make a series of revisions until you are satisfied. However, "
+"inconsistencies can creep into your configuration from one revision to the "
+"next if you aren't careful. The main problem is, once a variable is given a "
+"default value, that value will not be recomputed from other variables that "
+"may change in later revisions."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:12
+msgid ""
+"For example, when the distribution is first set, many 'dependent' variables "
+"are given default values that suit that distribution. However, if you later "
+"decide to change the distribution, those dependent variables continue to "
+"retain old values that are no longer appropriate."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:14
+msgid ""
+"A second, related problem is that if you run #{lb config}# and then upgrade "
+"to a new version of live-build that has changed one of the variable names, "
+"you will discover this only by manual review of the variables in your config "
+"files, which you will then need to use to set the appropriate option again."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:16
+msgid ""
+"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
+"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
+"that are designed to help you manage your configuration. Simply create an "
+"auto/config script containing #{lb config}# command with all desired "
+"options, and an auto/clean that removes the files containing configuration "
+"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"files will be executed. This will ensure that your configuration is kept "
+"internally consistent from one revision to the next and from one live-build "
+"release to the next (though you will still have to take care and read the "
+"documentation when you upgrade live-build and make adjustments as needed)."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:18
+msgid "2~ Example auto scripts"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:20
+msgid ""
+"Use the following auto script examples as the starting point for your new "
+"live-build configuration. Take note that when you call the #{lb}# command "
+"that the auto script wraps, you must specify #{noauto}# as its parameter to "
+"ensure that the auto script isn't called again, recursively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:22
+msgid "auto/config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:29
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"lb config noauto \\\n"
+"\t--architecture i386 \\\n"
+"\t${@}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:33
+msgid "auto/clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:41
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"lb clean noauto ${@}\n"
+"rm -f config/binary config/bootstrap \\\n"
+"\tconfig/chroot config/common config/source\n"
+"rm -f binary.log\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:45
+msgid "auto/build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:50
+msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:54
+msgid ""
+"Edit auto/config, changing or adding any options as you see fit. In the "
+"example above, --architecture is set to i386 so that when the image is built "
+"on an amd64 system, it will not default to building amd64 images. Change "
+"this to an appropriate value for your image (or delete it if you want to use "
+"the default) and add any additional options in continuation lines that "
+"follow."
+msgstr ""
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/pt_BR/user_overview.ssi.po
similarity index 66%
copy from manual/po/de/user_overview.ssi.po
copy to manual/po/pt_BR/user_overview.ssi.po
index d8c8b3c..2a3459d 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/pt_BR/user_overview.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Portuguese translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,41 +102,39 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_overview.ssi:2
@@ -154,13 +149,13 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:6
 msgid ""
-"This chapter contains an overview of the two main tools used in building "
-"Debian Live systems."
+"This chapter contains an overview of the three main tools used in building "
+"Debian Live systems: live-build, live-boot and live-config."
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~ live-build"
+msgid "2~live-build live-build"
 msgstr ""
 
 #. type: Plain text
@@ -209,11 +204,11 @@ msgid ""
 "Unlike debhelper, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
 "similar to tools such as #{dh-make}#. For more information about #{lb config}"
-"#, please see lb-config."
+"#, please see {The lb config command}#lb-config."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:24
+#: en/user_overview.ssi:22
 msgid ""
 "Besides the common config/common, which is used by all live-build commands, "
 "some additional files can be used to configure the behavior of specific "
@@ -223,7 +218,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:26
+#: en/user_overview.ssi:24
 msgid ""
 "For example, the #{lb_bootstrap_debootstrap}# command uses files named "
 "config/bootstrap and config/bootstrap_debootstrap to read the options it "
@@ -233,7 +228,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:28
+#: en/user_overview.ssi:26
 msgid ""
 "live-build respects environment variables which are present in the context "
 "of the shell it is running. If variables can be read from config files, then "
@@ -244,7 +239,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:30
+#: en/user_overview.ssi:28
 msgid ""
 "All config files are shell scripts which are sourced by a live-build "
 "command. That means they have to follow the normal shell syntax. You can "
@@ -252,7 +247,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:32
+#: en/user_overview.ssi:30
 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."
@@ -264,87 +259,68 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:34
-msgid "Please see installation for information on how to install live-build."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:36
-msgid "% FIXME: <xref linkend=\"installation\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:38
+#: en/user_overview.ssi:32
 msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:34
 msgid ""
-"_* *{lb config}*: Responsible for initialising a Live system configuration "
-"directory. See lb-config for more information."
+"_* *{lb config}*: Responsible for initializing a Live system configuration "
+"directory. See {The lb config command}#lb-config for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:36
 msgid ""
-"_* *{lb build}*: Responsible for starting a Live system build. See lb-build "
-"for more information."
+"_* *{lb build}*: Responsible for starting a Live system build. See {The lb "
+"build command}#lb-build for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:48
+#: en/user_overview.ssi:38
 msgid ""
 "_* *{lb clean}*: Responsible for removing parts of a Live system build. See "
-"lb-clean for more information."
+"{The lb clean command}#lb-clean for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:50
-msgid "% FIXME: <xref linkend=\"lb-clean\"/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:52
-msgid "3~ The #{lb config}# command"
+#: en/user_overview.ssi:40
+msgid "3~lb-config The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:42
 msgid ""
-"As discussed in live-build, the scripts that make up live-build source their "
-"configuration from a single directory named config/. As constructing this "
-"directory by hand would be time-consuming and error-prone, the #{lb config}# "
-"command can be used to create skeleton configuration folders."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:56
-msgid "% FIXME: <xref linkend=\"live-build\"/>"
+"As discussed in {live-build}#live-build, the scripts that make up live-build "
+"source their configuration from a single directory named config/. As "
+"constructing this directory by hand would be time-consuming and error-prone, "
+"the #{lb config}# command can be used to create skeleton configuration "
+"folders."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:58
+#: en/user_overview.ssi:44
 msgid ""
 "Issuing #{lb config}# without any arguments creates a config subdirectory "
 "which it populates with some default settings:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:63
+#: en/user_overview.ssi:49
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:68
+#: en/user_overview.ssi:54
 msgid ""
 "$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22 "
 "user user 4096 Sep 7 13:02 config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:82
 msgid ""
 "$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary "
 "drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2 "
@@ -369,7 +345,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:86
 msgid ""
 "Using #{lb config}# without any arguments would be suitable for users who "
 "are either happy editing the generated files, or are simply happy with the "
@@ -377,7 +353,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:88
 msgid ""
 "You can ask #{lb config}# to generate a config/ directory \"preseeded\" with "
 "various options. This might be suitable if you do not require the default "
@@ -385,38 +361,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:92
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:96
 msgid ""
 "will build a config/ directory configured to include the 'gnome' package "
 "list. It is possible to specify many options:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:114
+#: en/user_overview.ssi:100
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
+#: en/user_overview.ssi:104
 msgid ""
 "A full list of options is available in the #{lb_config}# man page. Most "
 "options have a parallel with an \"LB_\" prefixed variable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
-msgid "3~ The #{lb build}# command"
+#: en/user_overview.ssi:106
+msgid "3~lb-build The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:122
+#: en/user_overview.ssi:108
 msgid ""
 "The #{lb build}# command reads in your configuration from the config/ "
 "directory. It then runs the lower lower level commands needed to build your "
@@ -424,24 +400,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
-msgid "3~ The #{lb clean}# command"
+#: en/user_overview.ssi:110
+msgid "3~lb-clean The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:126
+#: en/user_overview.ssi:112
 msgid ""
 "It is the job of the #{lb clean}# command to remove various parts of a build "
 "so subsequent builds can start from a clean state."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:128
-msgid "2~ The live-boot package"
+#: en/user_overview.ssi:114
+msgid "2~live-boot The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:130
+#: en/user_overview.ssi:116
 msgid ""
 "live-boot is a collection of scripts providing hooks for the initramfs-"
 "tools, used to generate an initramfs capable of booting live systems, such "
@@ -450,7 +426,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:132
+#: en/user_overview.ssi:118
 msgid ""
 "At boot time it will look for read-only media containing a \"/live\" "
 "directory where a root filesystem (often a compressed filesystem image like "
@@ -459,9 +435,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:133
+#: en/user_overview.ssi:120
 msgid ""
 "More information on initial ramfs in Debian can be found in the Debian Linux "
 "Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
 "on initramfs."
 msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:122
+msgid "2~live-config The live-config package"
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:124
+msgid ""
+"live-config consists of the scripts that run at boot time after live-boot to "
+"configure the live system automatically. It handles such tasks as setting "
+"the hostname, locales and timezone, creating the live user, inhibiting cron "
+"jobs and performing autologin of the live user."
+msgstr ""
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
new file mode 100644
index 0000000..e10d22b
--- /dev/null
+++ b/manual/po/ro/about_manual.ssi.po
@@ -0,0 +1,602 @@
+# Romanian translations for live-manual package
+# 2010 Eugen Paiuc <linux51 at bluewin.ch>
+# This file is distributed under the same license as the live-manual package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual 2.0~a8\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-23 10:34-0200\n"
+"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:2
+msgid ":B~ About this manual"
+msgstr ":B~ Despre acest manual"
+
+#. type: Plain text
+#: en/about_manual.ssi:4
+msgid "1~ About this manual"
+msgstr "1~ Despre acest manual"
+
+#. type: Plain text
+#: en/about_manual.ssi:6
+msgid ""
+"The main goal of this manual is to serve as a single access point to all "
+"documentation related to the Debian Live project. It does not include end-"
+"user documentation for using a Debian Live system as far as things are live "
+"specific."
+msgstr ""
+"Scopul principal al acestui manual este de a accesa intreaga documentatie a "
+"proiectului Debian Live intr-un singur loc. Dar aici nu vor fii gasite "
+"documantatii pentru utilizatorul final cu exceptia celor legate de sistemul "
+"live."
+
+#. type: Plain text
+#: en/about_manual.ssi:8
+msgid ""
+"Some of the commands mentioned in the text must be executed with superuser "
+"privileges which can be obtained by becoming the root user via #{su}# or by "
+"using #{sudo}#. To distinguish between commands which may be executed by an "
+"unprivileged user and those requiring superuser privileges, commands are "
+"prepended by #{$}# or #{#}# respectively. This symbol is not a part of the "
+"command."
+msgstr ""
+"Anumite comenzi din text trebuie sa fie executate ca 'super_utilizator', "
+"privilegiu care poate fi obtinut fie prin comanda #{su}, sau #{sudo}. Pentru "
+"a distinge intre acesti utilizatori se vor folosi #{$}# respectiv #{#}# . "
+"Aceste simboluri nu fac parte din comenzi."
+
+#. type: Plain text
+#: en/about_manual.ssi:10
+msgid "2~terms Terms"
+msgstr "2~terms Termeni"
+
+#. type: Plain text
+#: en/about_manual.ssi:12
+msgid ""
+"_* *{Live system}*: An operating system that can boot without installation "
+"to a hard drive. Live systems do not alter local operating system(s) or file"
+"(s) already installed on the computer hard drive unless instructed to do so. "
+"Live systems are typically booted from media such as CDs, DVDs or USB "
+"sticks. Some may also boot over the network."
+msgstr ""
+"_* *{Live system}*: Un sistem de operare care porneste fara a instala pe "
+"discul dur. Un sistem live nu altereaza un sistem de operare local sau "
+"fisiere deja instalate pe discul dur ci doar dace se mentioneaza expres "
+"acest lucru. Sistemele livefolosesc spre pornire medii ca CDs, DVDs sau chei "
+"USB. Unele chiar pot porni prin retaua de net."
+
+#. type: Plain text
+#: en/about_manual.ssi:14
+msgid ""
+"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
+"live-build, live-config, and live-manual packages."
+msgstr ""
+"_* *{Debian Live}*: Sub-proiectul Debian care gereaza pachetele live-boot, "
+"live-build, live-config, si live-manual."
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
+"_* *{Debian Live system}*: A live system that uses software from the Debian "
+"operating system that may be booted from CDs, DVDs, USB sticks, over the "
+"network (via netboot images), and over the Internet (via boot parameter #"
+"{fetch=URL}#)."
+msgstr ""
+"_* *{Debian Live system}*: Un sistem live care foloseste programe din "
+"sitemul de operare Debian, si care poate fi pornit folosind CDs, DVDs, chei "
+"USB, sau reteaua net (via netboot images), sau prin nternet (via boot "
+"parameter #{fetch=URL}#)."
+
+#. type: Plain text
+#: en/about_manual.ssi:18
+msgid "_* *{Host system}*: The environment used to create the live system."
+msgstr ""
+"_* *{Host system}*: Mediul folosit pentru crearea sistemului live pe un "
+"sistem dat."
+
+#. type: Plain text
+#: en/about_manual.ssi:20
+msgid "_* *{Target system}*: The environment used to run the live system."
+msgstr "_* *{Target system}*: Mediul folosit pentru rularea sistemului live."
+
+#. type: Plain text
+#: en/about_manual.ssi:22
+msgid ""
+"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
+"boot was formerly a part of live-initramfs."
+msgstr ""
+"_* *{live-boot}*: O coloctie se scripte folosite la pornirea sistemului "
+"live. live-boot a facul parte formal din live-initramfs."
+
+#. type: Plain text
+#: en/about_manual.ssi:24
+msgid ""
+"_* *{live-build}*: A collection of scripts used to build customized Debian "
+"Live systems. live-build was formerly known as live-helper, and even earlier "
+"known as live-package."
+msgstr ""
+"_* *{live-build}*: O colectie de scripte folosite la particularizatrea "
+"sistemelor Debian Live. live-build a fost cunoscut ca live-helper, iar mai "
+"inainte ca live-package."
+
+#. type: Plain text
+#: en/about_manual.ssi:26
+msgid ""
+"_* *{live-config}*: A collection of scripts used to configure a live system "
+"during the boot process. live-config was formerly a part of live-initramfs."
+msgstr ""
+"_* *{live-config}*: O colectie de scripte folosite la configurarea sitemului "
+"live in timpul procesului de pornire. live-config a fost cunoscut ca parte "
+"din live-initramfs."
+
+#. type: Plain text
+#: en/about_manual.ssi:28
+msgid ""
+"_* *{live-manual}*: This document is maintained in a package called live-"
+"manual."
+msgstr ""
+"_* *{live-manual}*: Acest document face parte din pachetul numit live-manual."
+
+#. type: Plain text
+#: en/about_manual.ssi:30
+msgid ""
+"_* *{Debian Installer (d-i)}*: The official installation system for the "
+"Debian distribution."
+msgstr ""
+"_* *{Debian Installer (d-i)}*: Sistemul de instalare oficial pentru "
+"distributia Debian."
+
+#. type: Plain text
+#: en/about_manual.ssi:32
+msgid ""
+"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
+"prompt to influence the kernel or live-config."
+msgstr ""
+"_* *{Boot parameters}*: Parameti care pot fi adaugati la promptul bootloader-"
+"ului care sa infuenteze kernelul sau live-config."
+
+#. type: Plain text
+#: en/about_manual.ssi:34
+msgid ""
+"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
+"instances of the GNU/Linux environment on a single system simultaneously "
+"without rebooting."
+msgstr ""
+"_* *{chroot}*: Programul chroot , chroot(8), permite rularea a diferite "
+"instante din mediul GNU/Linux pe un singur sistem si in simultan fara a "
+"necesita o repornire a sistemului."
+
+#. type: Plain text
+#: en/about_manual.ssi:36
+msgid ""
+"_* *{Binary image}*: A file containing the live system, such as binary.iso "
+"or binary.img."
+msgstr ""
+"_* *{Binary image}*: Un fisier ce contine sistemul live, ca de exemplu "
+"binary.iso sau binary.img."
+
+#. type: Plain text
+#: en/about_manual.ssi:38
+msgid ""
+"_* *{Target distribution}*: The distribution upon which your live system "
+"will be based. This can differ from the distribution of your host system."
+msgstr ""
+"_* *{Target distribution}*: Dea pe care se bazeaza sistemul live. Aceasta "
+"distributie poate fi diferita de cea a sistemului gazda."
+
+#. type: Plain text
+#: en/about_manual.ssi:40
+msgid ""
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
+"contains the latest officially released distribution of Debian. The testing "
+"distribution is the staging area for the next stable release. A major "
+"advantage of using this distribution is that it has more recent versions of "
+"software relative to the stable release. The unstable distribution is where "
+"active development of Debian occurs. Generally, this distribution is run by "
+"developers and those who like to live on the edge."
+msgstr ""
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: stable contine ultima "
+"versiune oficiala a distributiei Debian. testing este sursa pentru "
+"urmatoarea versiune stable. Pricipalul avantaj la folosirea distibutiei "
+"testing este folosirea programelor mai noi decat cele din stable. "
+"Distributia unstable este locul unde au loc activ dezvoltarile din Debian. "
+"In general ea este folosita de dezvoltatori sau de cei ce le place "
+"riscul ... ."
+
+#. type: Plain text
+#: en/about_manual.ssi:42
+msgid ""
+"At the time of writing, Squeeze is the current stable release and Wheezy is "
+"the current testing release. Sid will always be a synonym for the unstable "
+"release."
+msgstr ""
+"La momentul in care au fost scrise aceste randurei, versiunea stable este "
+"Squeeze, Wheezy estei versiunea testing. Sid va fi mereu simbolul versiunii "
+"unstable."
+
+#. type: Plain text
+#: en/about_manual.ssi:44
+msgid "2~ Authors"
+msgstr "2~ Autori"
+
+#. type: Plain text
+#: en/about_manual.ssi:46
+msgid "A list of authors (in alphabetical order):"
+msgstr "Lista autorilor (in ordine alfabetica):"
+
+#. type: Plain text
+#: en/about_manual.ssi:48
+msgid "_* Ben Armstrong"
+msgstr "_* Ben Armstrong"
+
+#. type: Plain text
+#: en/about_manual.ssi:50
+msgid "_* Brendan Sleight"
+msgstr "_* Brendan Sleight"
+
+#. type: Plain text
+#: en/about_manual.ssi:52
+msgid "_* Chris Lamb"
+msgstr "_* Chris Lamb"
+
+#. type: Plain text
+#: en/about_manual.ssi:54
+msgid "_* Daniel Baumann"
+msgstr "_* Daniel Baumann"
+
+#. type: Plain text
+#: en/about_manual.ssi:56
+msgid "_* Franklin Piat"
+msgstr "_* Franklin Piat"
+
+#. type: Plain text
+#: en/about_manual.ssi:58
+msgid "_* Jonas Stein"
+msgstr "_* Jonas Stein"
+
+#. type: Plain text
+#: en/about_manual.ssi:60
+msgid "_* Kai Hendry"
+msgstr "_* Kai Hendry"
+
+#. type: Plain text
+#: en/about_manual.ssi:62
+msgid "_* Marco Amadori"
+msgstr "_* Marco Amadori"
+
+#. type: Plain text
+#: en/about_manual.ssi:64
+msgid "_* Mathieu Geli"
+msgstr "_* Mathieu Geli"
+
+#. type: Plain text
+#: en/about_manual.ssi:66
+msgid "_* Matthias Kirschner"
+msgstr "_* Matthias Kirschner"
+
+#. type: Plain text
+#: en/about_manual.ssi:68
+msgid "_* Richard Nelson"
+msgstr "_* Richard Nelson"
+
+#. type: Plain text
+#: en/about_manual.ssi:70
+msgid "_* Trent W. Buck"
+msgstr "_* Trent W. Buck"
+
+#. type: Plain text
+#: en/about_manual.ssi:72
+msgid "2~ Contributing to this document"
+msgstr "2~ Cum se poate contribui la acest document"
+
+#. type: Plain text
+#: en/about_manual.ssi:74
+msgid ""
+"This manual is intended as a community project and all proposals for "
+"improvements and contributions are extremely welcome. The preferred way to "
+"submit a contribution is to send it to the mailing list. Please see {Contact}"
+"#contact for more information."
+msgstr ""
+"Acest manual este conceput ca un proiect comunitar si astfel orice "
+"propozitie sau inbunatatire sunt bune venite. Principala cale de a face o "
+"contributie este trimeterea unui mail la mailing list. Vedeti {Contact}"
+"#contact pentru mai multe informatii."
+
+#. type: Plain text
+#: en/about_manual.ssi:76
+msgid ""
+"When submitting a contribution, please clearly identify its copyright holder "
+"and include the licensing statement. Note that to be accepted, the "
+"contribution must be licensed under the same license as the rest of the "
+"document, namely, GPL version 3 or later."
+msgstr ""
+"In orice contributie trimisa va rog sa precizati in clar cine detine "
+"copyright-ul si sub ce licenta este publicata. A se nota ca o contrinutie "
+"este acceptata daca este licentiata in acceeasi termeni ca si restul "
+"documentului , adica GPL version 3 or later."
+
+#. type: Plain text
+#: en/about_manual.ssi:78
+msgid ""
+"The sources for this manual are maintained using the Git version control "
+"system. You can checkout the latest copy by executing:"
+msgstr ""
+"Sursele acestui manual sunt gerate folosind Git version control system. Pute-"
+"ti checkout ultima copie prin executarea :"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:82
+msgid "$ git clone git://live.debian.net/git/live-manual.git"
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/about_manual.ssi:86
+msgid ""
+"Prior to submission of your contribution, please preview your work. To "
+"preview the live-manual, ensure the packages needed for building are "
+"installed by executing:"
+msgstr ""
+"Inainte de a trimite contibutia dvs, este de dorit sa efectuati o "
+"previzualizare a lucrarii. Pentru aceasta verifica-ti ca pachetele necesare "
+"pentru 'building' sunt instalate, prin executatea comenzii:"
+
+#. type: Plain text
+#: en/about_manual.ssi:90
+msgid "# apt-get install make po4a sisu-complete"
+msgstr "# apt-get install make po4a sisu-complete"
+
+#. type: Plain text
+#: en/about_manual.ssi:94
+msgid ""
+"You may build the live-manual from the top level directory of your git "
+"checkout by executing:"
+msgstr ""
+"Pute-ti crea live-manual de la nivelul de sus al directorului git checkout "
+"al dvs, prin executatea:"
+
+#. type: Plain text
+#: en/about_manual.ssi:98
+msgid "$ make build"
+msgstr "$ make build"
+
+#. type: Plain text
+#: en/about_manual.ssi:102
+msgid "3~ Applying patches"
+msgstr "3~ Aplicarea de patch-uri"
+
+#. type: Plain text
+#: en/about_manual.ssi:104
+msgid ""
+"Directly commiting to the repository is possible by anyone. However, we ask "
+"you to send bigger changes to the mailing list to discuss them first. In "
+"order to push to the repository, the following steps are required."
+msgstr ""
+"Commiterea in direct este la indemana oricui. Totusi, va rugam sa trimeteti "
+"schimbarile mai mari , spre discutie , la mailing list. Pentru a fi trimise "
+"contibutiile la repository, pasii urmatori sunt necesari:"
+
+#. type: Plain text
+#: en/about_manual.ssi:106
+msgid "_* Fetch the public commit key:"
+msgstr "_* Fetch the public commit key:"
+
+#. type: Plain text
+#: en/about_manual.ssi:115
+#, no-wrap
+msgid ""
+"$ mkdir -p ~/.ssh/identity.d\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+msgstr ""
+"$ mkdir -p ~/.ssh/identity.d\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:119
+msgid "_* Add the following section to your openssh-client config:"
+msgstr "_* Adaugati urmatoarea sectiuna la openssh-client config:"
+
+#. type: Plain text
+#: en/about_manual.ssi:128
+#, no-wrap
+msgid ""
+"$ cat >> ~/.ssh/config << EOF\n"
+"Host live.debian.net\n"
+"        Hostname live.debian.net\n"
+"        User gitosis\n"
+"        IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+"EOF\n"
+msgstr ""
+"$ cat >> ~/.ssh/config << EOF\n"
+"Host live.debian.net\n"
+"        Hostname live.debian.net\n"
+"        User gitosis\n"
+"        IdentityFile ~/.ssh/identity.d/live-manual at debian-live\n"
+"EOF\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:132
+msgid "_* Checkout a clone of the manual through ssh:"
+msgstr "_* Checkout un clon al manualului prin ssh:"
+
+#. type: Plain text
+#: en/about_manual.ssi:136
+msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
+msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
+
+#. type: Plain text
+#: en/about_manual.ssi:140
+msgid ""
+"_* After editing the files in manual/en/, please call the 'commit' target in "
+"the top level directory to sanitize the files and update the translation "
+"files:"
+msgstr ""
+"_* Dupa editarea de fisiere in manual/en/, va rugam folositi 'commit' in the "
+"top level directory to sanitize the files and update the translation files:"
+
+#. type: Plain text
+#: en/about_manual.ssi:144
+msgid "$ make commit"
+msgstr "$ make commit"
+
+#. type: Plain text
+#: en/about_manual.ssi:148
+msgid ""
+"_* After sanitizing commit the changes. Write commit messages, that consist "
+"of full useful sentences, starting with a capital letter and ending with a "
+"full stop. Usually starting with the form 'Fixing/Adding/Removing/"
+"Correcting/':"
+msgstr ""
+"_* Dupa 'sanitizare' 'commit' schimbarile. Scrieti mesajele de commit, care "
+"constau in propozitii clare, care incep cu litere Mari, si se incheie cu "
+"punct si sens. Inceputul poate fii de forma 'Fixing/Adding/Removing/"
+"Correcting/':"
+
+#. type: Plain text
+#: en/about_manual.ssi:152
+msgid "$ git commit -a"
+msgstr "$ git commit -a"
+
+#. type: Plain text
+#: en/about_manual.ssi:156
+msgid "_* Push the commit to the server:"
+msgstr "_* Primite commit-ul la server:"
+
+#. type: Plain text
+#: en/about_manual.ssi:160
+msgid "$ git push"
+msgstr "$ git push"
diff --git a/manual/po/ro/about_project.ssi.po b/manual/po/ro/about_project.ssi.po
new file mode 100644
index 0000000..215cc92
--- /dev/null
+++ b/manual/po/ro/about_project.ssi.po
@@ -0,0 +1,296 @@
+# Romanian translations for live-manual package
+# 2010 Eugen Paiuc <linux51 at bluewin.ch>
+# This file is distributed under the same license as the live-manual package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 2.0~a8\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
+
+#. type: Plain text
+#: en/about_project.ssi:2
+msgid ":B~ About the Debian Live Project"
+msgstr ":B~ Despre Proiectul Debian Live"
+
+#. type: Plain text
+#: en/about_project.ssi:4
+msgid "1~ About the Debian Live Project"
+msgstr "1~ Despre Proiectul Debian Live"
+
+#. type: Plain text
+#: en/about_project.ssi:6
+msgid "2~ Motivation"
+msgstr "2~ Motivatie"
+
+#. type: Plain text
+#: en/about_project.ssi:8
+msgid "3~ What is wrong with current live systems"
+msgstr "3~ Ce nu e bine cu sistemele live actuale"
+
+#. type: Plain text
+#: en/about_project.ssi:10
+msgid ""
+"When Debian Live was initiated, there were already several Debian based live "
+"systems available and they are doing a great job. From the Debian "
+"perspective most of them have one or more of the following disadvantages:"
+msgstr ""
+"La momentul de inceput al proiectului Debian Live existau deja cateva "
+"sisteme Debian live si ele au depus o munca interesanta. Din perspectiva "
+"Debian marea majoritate a acestor sisteme au urmatoarele dezavantaje:"
+
+#. type: Plain text
+#: en/about_project.ssi:12
+msgid "_* They are unofficial projects, developed outside of Debian."
+msgstr "_* Sunt proiecte neoficiale, dezvoltate in afara proiectului Debian."
+
+#. type: Plain text
+#: en/about_project.ssi:14
+msgid "_* They mix different distributions, e.g. testing and unstable."
+msgstr "_* Ele amalgameaza diferite distributii, ca testing si unstable."
+
+#. type: Plain text
+#: en/about_project.ssi:16
+msgid "_* They support i386 only."
+msgstr "_* Ele suporta doar arhitectura i386."
+
+#. type: Plain text
+#: en/about_project.ssi:18
+msgid ""
+"_* They modify the behaviour and/or appearance of packages by stripping them "
+"down to save space."
+msgstr ""
+"_* Ele au modificat comportamentul si /sau aspectul programelor pentru a "
+"castuga spatiu."
+
+#. type: Plain text
+#: en/about_project.ssi:20
+msgid "_* They include unofficial packages."
+msgstr "_* Ele includ programe neoficiale."
+
+#. type: Plain text
+#: en/about_project.ssi:22
+msgid ""
+"_* They ship custom kernels with additional patches that are not part of "
+"Debian."
+msgstr ""
+"_* Ele folosesc kernele modificate care contin patch-uri ce nu fac parte din "
+"Debian."
+
+#. type: Plain text
+#: en/about_project.ssi:24
+msgid ""
+"_* They are large and slow due to their sheer size and thus not suitable for "
+"rescue issues."
+msgstr ""
+"_* Ele sunt greoaie si lente datorete marimii lor si deci inapropiate pentru "
+"situatii de salvare/rescue."
+
+#. type: Plain text
+#: en/about_project.ssi:26
+msgid ""
+"_* They are not available in different flavours, e.g. CDs, DVDs, USB-stick "
+"and netboot images."
+msgstr ""
+"_* Ele nu sunt disponibile in diferite sosuri ca CDs, DVDs, USB-stick si "
+"netboot images."
+
+#. type: Plain text
+#: en/about_project.ssi:28
+msgid "3~ Why create our own live system?"
+msgstr "3~ De ce e nevoie de propriul nostru sistem live ?"
+
+#. type: Plain text
+#: en/about_project.ssi:30
+msgid ""
+"Debian is the Universal Operating System: Debian has an official live system "
+"for showing around and to officially represent the true, one and only Debian "
+"system with the following main advantages:"
+msgstr ""
+"Debian este 'the Universal Operating System/Sistemul de Operare Universal' : "
+"Debian are un sistem live oficial pentru a se arata in jur si a reprezenta "
+"oficial adevarul, doar sistemul Debian are principalele avantaje:"
+
+#. type: Plain text
+#: en/about_project.ssi:32
+msgid "_* It would be an official Debian subproject."
+msgstr "_* Acesta va fi un subpriect Debian oficial."
+
+#. type: Plain text
+#: en/about_project.ssi:34
+msgid "_* It reflects the (current) state of one distribution."
+msgstr "_* El reflecta starea (actuala) a distributiei."
+
+#. type: Plain text
+#: en/about_project.ssi:36
+msgid "_* It runs on as many architectures as possible."
+msgstr "_* Se poate utiliza pe maximum de arhitecturi posibile."
+
+#. type: Plain text
+#: en/about_project.ssi:38
+msgid "_* It consists of unchanged Debian packages only."
+msgstr "_* Contine doar programe Debian."
+
+#. type: Plain text
+#: en/about_project.ssi:40
+msgid "_* It does not contain any unofficial packages."
+msgstr "_* Nu contine programe neoficiale."
+
+#. type: Plain text
+#: en/about_project.ssi:42
+msgid "_* It uses an unaltered Debian kernel with no additional patches."
+msgstr "_* Foloseste un kernel Debian nealterat, fara patch-uri aditionale."
+
+#. type: Plain text
+#: en/about_project.ssi:44
+msgid "2~ Philosophy"
+msgstr "2~ Filozofia"
+
+#. type: Plain text
+#: en/about_project.ssi:46
+msgid "3~ Only unchanged, official packages"
+msgstr "3~ Doar programe oficiale, fara schimbari."
+
+#. type: Plain text
+#: en/about_project.ssi:48
+msgid ""
+"We will only use official packages from the Debian repository in the \"main"
+"\" section. The non-free section is not part of Debian and therefore cannot "
+"be used at all for official live system images."
+msgstr ""
+"Vor fi folosite doar programe oficiale din depozitele Debian sectiunea \"main"
+"\". Sectiunea non-free nu e parte din Debian si deci nu poate fi folosita in "
+"nici un fel la construirea imaginilor live oficiale."
+
+#. type: Plain text
+#: en/about_project.ssi:50
+msgid ""
+"We will not change any packages. Whenever we need to change something, we "
+"will do that in coordination with its package maintainer in Debian."
+msgstr ""
+"Nu vor fi facute nici o schimbare in programe. Daca este nevoie de acest "
+"lucru, schimbarile vor fi facute in coordonare cu responsabilul de program "
+"din Debian."
+
+#. type: Plain text
+#: en/about_project.ssi:52
+msgid ""
+"As an exception, our own packages such as live-boot, live-build or live-"
+"config may temporarily be used from our own repository for development "
+"reasons (e.g. to create development snapshots). They will be uploaded to "
+"Debian on a regular basis."
+msgstr ""
+"Ca o exceptie, programele specifice ca live-boot, live-build sau live-config "
+"pot fi folosite temporar din depozitele proprii live, pentru nevoi de "
+"dezvoltare. (de exemplu pentru creerea de development snapshots). Acestea "
+"vor fi upload-ate in Debian la date cuvenite."
+
+#. type: Plain text
+#: en/about_project.ssi:54
+msgid "3~ No package configuration of the live system"
+msgstr "3~ Nu vor fi programe de configurare pentru sistemul live."
+
+#. type: Plain text
+#: en/about_project.ssi:56
+msgid ""
+"In this phase we will not ship or install sample or alternative "
+"configurations. All packages are used in their default configuration as they "
+"are after a regular installation of Debian."
+msgstr ""
+"In aceasta faza nu vor fi propuse sau instalate example sau configuratii "
+"alternative. Toate programele sunt folosite cu configuratia default 'de "
+"baza', la fel ca in instalatia normaladin Debian."
+
+#. type: Plain text
+#: en/about_project.ssi:58
+msgid ""
+"Whenever we need a different default configuration, we will do that in "
+"coordination with its package maintainer in Debian."
+msgstr ""
+"In caz de nevoie a unei configuratii diferite, aceasta schimbare va fii "
+"facuta in coordonare cu responsabilui de program din Debian."
+
+#. type: Plain text
+#: en/about_project.ssi:60
+msgid ""
+"A system for configuring packages is provided using debconf in #{lb config}# "
+"(use --preseed FILE) allowing custom configured packages to be installed in "
+"your custom produced Debian Live images, but for official live images only "
+"default configuration will be used. For more information, please see "
+"{Customization overview}#customization-overview."
+msgstr ""
+"Cu toate acestea un sistem de configurare a programelor este permisa "
+"folosind debconf in #{lb config}# (use --preseed FILE), ce permite o "
+"particularizare a configurari programelor in sistemul live facur de dvs., "
+"insa imaginile oficiale live doar configurari de baza vot fi folosite. "
+"Pentru mai multe informatii, urmariti {Customization overview}#customization-"
+"overview."
+
+#. type: Plain text
+#: en/about_project.ssi:62
+msgid ""
+"Exception: There are a few essential changes needed to bring a live system "
+"to life (e.g. configuring pam to allow empty passwords). These essential "
+"changes have to be kept as minimal as possible and should be merged within "
+"the Debian repository if possible."
+msgstr ""
+"Exceptie: Sunt desigur necesare cateva necesare sa aducem 'la viata' un "
+"sistem live ( de exemplu: configuratea pam care sa permita empty passwords). "
+"Dar aceste schimbari esentiale trebuie minimizate la maximum si pastrate in "
+"concordanta cu depozitul Debian."
+
+#. type: Plain text
+#: en/about_project.ssi:64
+msgid "2~contact Contact"
+msgstr "2~contact Contact"
+
+#. type: Plain text
+#: en/about_project.ssi:66
+msgid ""
+"_* *{Mailing list}*: The primary contact for the project is the mailing list "
+"at http://lists.debian.org/debian-live/. You can email the list directly by "
+"addressing your mail to debian-live at lists.debian.org. The list archives are "
+"available at http://lists.debian.org/debian-live/."
+msgstr ""
+"_* *{Mailing list}*: Principalul mod de contact din proiect este mailing "
+"list la http://lists.debian.org/debian-live/.Va pute-ti adresa in direct "
+"prin mail la debian-live at lists.debian.org. Arhiva listei o gasi-ti la http://"
+"lists.debian.org/debian-live/."
+
+#. type: Plain text
+#: en/about_project.ssi:68
+msgid ""
+"_* *{IRC}*: A number of users and developers are present in the #debian-live "
+"channel on irc.debian.org (OFTC). When asking a question on IRC, please be "
+"patient for an answer. If no answer is forthcoming, please email the mailing "
+"list."
+msgstr ""
+"_* *{IRC}*: Un numar de utilizatori si dezvoltatori sunt prezenti in canalul "
+"#debian-live pe n irc.debian.org (OFTC). Daca aveti o intrebare pentru IRC , "
+"fiti cu multa rabdare in asteptarea raspunsului. In caz de lipsa a unui "
+"raspuns , folositi mailing list."
+
+#. type: Plain text
+#: en/about_project.ssi:70
+msgid ""
+"_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
+"reported by users and developers. Each bug is given a number, and is kept on "
+"file until it is marked as having been dealt with. For more information, "
+"please see {Reporting bugs}#bugs."
+msgstr ""
+"_* *{BTS}*: BTS adica Debian Bug Tracking System , contine detalii asupra "
+"rapoartelor de bug facute de utilizatorisau dezvoltatori. Fiecare bug are un "
+"numar, si este mentinut deschis pana la rezolvare. Alte informatii gasiti la "
+"{Reporting bugs}#bugs."
+
+#. type: Plain text
+#: en/about_project.ssi:71
+msgid ""
+"_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
+"place to gather information, discuss applied technologies, and document "
+"frameworks of Debian Live systems that go beyond the scope of this document."
+msgstr ""
+"_* *{Wiki}*: Debian Live are un wiki la http://wiki.debian.org/DebianLive , "
+"si este locul unde pot fi gasite diferite informatii, se discuta modul de "
+"aplicare de tehnologii, sau sunt documentate alte lucrari legate de debian "
+"live si care pot depasi cadrul acestui document."
diff --git a/manual/pot/index.html.in.pot b/manual/po/ro/index.html.in.po
similarity index 84%
copy from manual/pot/index.html.in.pot
copy to manual/po/ro/index.html.in.po
index facd290..7723804 100644
--- a/manual/pot/index.html.in.pot
+++ b/manual/po/ro/index.html.in.po
@@ -1,20 +1,21 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Romanian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+# Automatically generated, 2010.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2010-10-20 20:02+0300\n"
+"PO-Revision-Date: 2010-10-20 20:02+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Content of: <html><head><title>
 #: en/index.html.in:4
@@ -36,8 +37,8 @@ msgstr ""
 msgid ""
 "Please report errors, omissions, patches and suggestions to our mailinglist "
 "at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/meta.html#contributing\">how to "
-"contribute</a> to the manual."
+"org</a> and read about <a href=\"html/1.html#37\">how to contribute</a> to "
+"the manual."
 msgstr ""
 
 #. type: Content of: <html><body><h3>
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
similarity index 69%
copy from manual/po/de/live-manual.ssm.po
copy to manual/po/ro/live-manual.ssm.po
index bb7f289..4d0a6a0 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,15 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-25 23:12+0300\n"
+"PO-Revision-Date: 2010-10-23 00:04+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/live-manual.ssm:2
@@ -24,7 +25,7 @@ msgstr ""
 #. type: Plain text
 #: en/live-manual.ssm:4
 msgid "@title: Debian Live Manual"
-msgstr "@title: Debian Live Handbuch"
+msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:6
@@ -45,7 +46,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-10-03\n"
+" :published: 2010-10-25\n"
 msgstr ""
 
 #. type: Plain text
@@ -58,7 +59,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@make:\n"
-" :bold: /lenny|stable|squeeze|testing|sid|unstable/\n"
+" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
 " :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
 " :num_top: 1\n"
 " :skin: skin_debian-live\n"
@@ -106,110 +107,130 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:39
-msgid "<< user_customization-packages.ssi"
+msgid "<< user_managing_a_configuration.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:41
-msgid "<< user_customization-contents.ssi"
+msgid "<< user_customization-overview.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:43
-msgid ":B~ Development ~#"
+msgid "<< user_customization-packages.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:45
-msgid ":B~ Project ~#"
+msgid "<< user_customization-contents.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid ":B~ Other ~#"
+msgid "<< user_customization-internationalization.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid "<< other_customization-internationalization.ssi"
+msgid ":B~ Development ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:51
-msgid "<< other_customization-bootup.ssi"
+msgid ":B~ Project ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:53
-msgid "<< other_customization-binary.ssi"
+msgid "<< project_bugs.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
-msgid "<< other_customization-backports.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:57
-msgid "<< other_common-tasks.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:59
-msgid "<< other_live-environment.ssi"
+msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:61
-msgid "<< other_faq.ssi"
+msgid ""
+"Other material that formerly appeared in this section is out of date and/or "
+"has not been approved for release. It has therefore been omitted, but can "
+"still be found in the document source; see 'About this manual'. Any part of "
+"the omitted material that is still useful will be included in the release "
+"only after it has been reviewed."
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:63
-msgid "<< other_reporting-bugs.ssi"
+msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:65
-msgid "<< other_howtos.ssi"
+msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:67
-msgid "<< other_coding-style.ssi"
+msgid "% << other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:69
-msgid "<< other_procedures.ssi"
+msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:71
-msgid "<< other_resources.ssi"
+msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:73
-msgid "<< other_use-cases.ssi"
+msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:75
-msgid "<< other_success-stories.ssi"
+msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:77
-msgid "<< other_troubleshooting.ssi"
+msgid "% << other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:79
-msgid "<< other_configuration-layout.ssi"
+msgid "% << other_procedures.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:81
+msgid "% << other_resources.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:83
+msgid "% << other_use-cases.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:85
+msgid "% << other_success-stories.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:87
+msgid "% << other_troubleshooting.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:89
+msgid "% << other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:80
-msgid "<< other_configuration-files.ssi"
+#: en/live-manual.ssm:90
+msgid "% << other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/po/de/other_coding-style.ssi.po b/manual/po/ro/other_coding-style.ssi.po
similarity index 98%
copy from manual/po/de/other_coding-style.ssi.po
copy to manual/po/ro/other_coding-style.ssi.po
index 81ab20f..980c8ad 100644
--- a/manual/po/de/other_coding-style.ssi.po
+++ b/manual/po/ro/other_coding-style.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,12 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +73,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +130,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_coding-style.ssi:2
diff --git a/manual/po/de/other_common-tasks.ssi.po b/manual/po/ro/other_common-tasks.ssi.po
similarity index 60%
copy from manual/po/de/other_common-tasks.ssi.po
copy to manual/po/ro/other_common-tasks.ssi.po
index 10396a9..697ec41 100644
--- a/manual/po/de/other_common-tasks.ssi.po
+++ b/manual/po/ro/other_common-tasks.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,95 +6,93 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,31 +103,39 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_common-tasks.ssi:2
@@ -190,7 +196,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_common-tasks.ssi:18
 msgid ""
-"This whole process can be preseeded and customised in a number of ways; see "
+"This whole process can be preseeded and customized in a number of ways; see "
 "the relevant \"DebianInstaller\" wiki page and installation guide for more. "
 "This is operational now withing live-helper."
 msgstr ""
diff --git a/manual/po/de/other_configuration-files.ssi.po b/manual/po/ro/other_configuration-files.ssi.po
similarity index 98%
copy from manual/po/de/other_configuration-files.ssi.po
copy to manual/po/ro/other_configuration-files.ssi.po
index 8c1ca55..8e4fa57 100644
--- a/manual/po/de/other_configuration-files.ssi.po
+++ b/manual/po/ro/other_configuration-files.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,12 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/other_configuration-files.ssi:2
diff --git a/manual/po/de/other_configuration-layout.ssi.po b/manual/po/ro/other_configuration-layout.ssi.po
similarity index 96%
copy from manual/po/de/other_configuration-layout.ssi.po
copy to manual/po/ro/other_configuration-layout.ssi.po
index ad61482..e6f7e92 100644
--- a/manual/po/de/other_configuration-layout.ssi.po
+++ b/manual/po/ro/other_configuration-layout.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,12 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/other_configuration-layout.ssi:2
diff --git a/manual/po/de/other_customization-backports.ssi.po b/manual/po/ro/other_customization-backports.ssi.po
similarity index 97%
copy from manual/po/de/other_customization-backports.ssi.po
copy to manual/po/ro/other_customization-backports.ssi.po
index b8a1ef4..10d8a00 100644
--- a/manual/po/de/other_customization-backports.ssi.po
+++ b/manual/po/ro/other_customization-backports.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,12 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +73,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +130,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_customization-backports.ssi:2
diff --git a/manual/po/de/other_customization-binary.ssi.po b/manual/po/ro/other_customization-binary.ssi.po
similarity index 86%
copy from manual/po/de/other_customization-binary.ssi.po
copy to manual/po/ro/other_customization-binary.ssi.po
index 18724ed..dd7ecb1 100644
--- a/manual/po/de/other_customization-binary.ssi.po
+++ b/manual/po/ro/other_customization-binary.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,24 +6,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/other_customization-binary.ssi:2
-msgid "B~ Customising the binary image"
+msgid "B~ Customizing the binary image"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-binary.ssi:4
-msgid "1~ Customising the binary image<"
+msgid "1~ Customizing the binary image<"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/other_customization-bootup.ssi.po b/manual/po/ro/other_customization-bootup.ssi.po
similarity index 58%
copy from manual/po/de/other_customization-bootup.ssi.po
copy to manual/po/ro/other_customization-bootup.ssi.po
index 360517d..50a1fe6 100644
--- a/manual/po/de/other_customization-bootup.ssi.po
+++ b/manual/po/ro/other_customization-bootup.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,95 +6,93 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,46 +103,54 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:2
-msgid "B~ Customising the bootup process"
+msgid "B~ Customizing the bootup process"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:4
-msgid "1~ Customising the bootup process"
+msgid "1~ Customizing the bootup process"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:6
 msgid ""
-"This chapter discusses customisation of bootup process of a live system, "
+"This chapter discusses customization of bootup process of a live system, "
 "including kernel options, modifications to the bootloader, \"splash\" "
 "screens and startup scripts."
 msgstr ""
diff --git a/manual/po/de/other_faq.ssi.po b/manual/po/ro/other_faq.ssi.po
similarity index 87%
copy from manual/po/de/other_faq.ssi.po
copy to manual/po/ro/other_faq.ssi.po
index de35d69..19c23f6 100644
--- a/manual/po/de/other_faq.ssi.po
+++ b/manual/po/ro/other_faq.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,95 +6,93 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"PO-Revision-Date: 2010-10-16 14:45-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,31 +103,39 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_faq.ssi:2
@@ -466,7 +472,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_faq.ssi:163
 msgid ""
-"Q: How do I add software not in Debian ? A: See Customising package "
+"Q: How do I add software not in Debian ? A: See Customizing package "
 "installation % FIXME: <xref linkend=\"packages\"/>"
 msgstr ""
 
@@ -643,7 +649,7 @@ msgstr ""
 #: en/other_faq.ssi:234
 msgid ""
 "Q: How do I get past boot prompt without a working keyboard? A: See "
-"Customising the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
+"Customizing the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
 "Boot from an USB-HDD on an iMac with GRUB did not work."
 msgstr ""
 
diff --git a/manual/po/de/other_howtos.ssi.po b/manual/po/ro/other_howtos.ssi.po
similarity index 98%
copy from manual/po/de/other_howtos.ssi.po
copy to manual/po/ro/other_howtos.ssi.po
index d98d7ea..1d03760 100644
--- a/manual/po/de/other_howtos.ssi.po
+++ b/manual/po/ro/other_howtos.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,12 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +73,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +130,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_howtos.ssi:2
diff --git a/manual/po/de/other_live-environment.ssi.po b/manual/po/ro/other_live-environment.ssi.po
similarity index 99%
copy from manual/po/de/other_live-environment.ssi.po
copy to manual/po/ro/other_live-environment.ssi.po
index fea7cfb..f0ee2ef 100644
--- a/manual/po/de/other_live-environment.ssi.po
+++ b/manual/po/ro/other_live-environment.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,12 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +73,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +130,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
diff --git a/manual/po/de/other_procedures.ssi.po b/manual/po/ro/other_procedures.ssi.po
similarity index 98%
copy from manual/po/de/other_procedures.ssi.po
copy to manual/po/ro/other_procedures.ssi.po
index 3858198..b0dc4c9 100644
--- a/manual/po/de/other_procedures.ssi.po
+++ b/manual/po/ro/other_procedures.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,12 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +73,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +130,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_procedures.ssi:2
@@ -335,7 +336,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_procedures.ssi:91
 msgid "Debian Live project homepage:"
-msgstr "Debian Live Projekt Homepage:"
+msgstr ""
 
 #. type: Plain text
 #: en/other_procedures.ssi:93
diff --git a/manual/po/de/other_resources.ssi.po b/manual/po/ro/other_resources.ssi.po
similarity index 93%
copy from manual/po/de/other_resources.ssi.po
copy to manual/po/ro/other_resources.ssi.po
index ebfbb80..318d5d6 100644
--- a/manual/po/de/other_resources.ssi.po
+++ b/manual/po/ro/other_resources.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,12 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
diff --git a/manual/po/de/other_success-stories.ssi.po b/manual/po/ro/other_success-stories.ssi.po
similarity index 87%
copy from manual/po/de/other_success-stories.ssi.po
copy to manual/po/ro/other_success-stories.ssi.po
index c88b9e3..c42fc01 100644
--- a/manual/po/de/other_success-stories.ssi.po
+++ b/manual/po/ro/other_success-stories.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,12 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
diff --git a/manual/po/de/other_troubleshooting.ssi.po b/manual/po/ro/other_troubleshooting.ssi.po
similarity index 88%
copy from manual/po/de/other_troubleshooting.ssi.po
copy to manual/po/ro/other_troubleshooting.ssi.po
index 05185bd..f99da6a 100644
--- a/manual/po/de/other_troubleshooting.ssi.po
+++ b/manual/po/ro/other_troubleshooting.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,12 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/other_troubleshooting.ssi:2
diff --git a/manual/po/de/other_use-cases.ssi.po b/manual/po/ro/other_use-cases.ssi.po
similarity index 98%
copy from manual/po/de/other_use-cases.ssi.po
copy to manual/po/ro/other_use-cases.ssi.po
index 172dd6e..1b4925a 100644
--- a/manual/po/de/other_use-cases.ssi.po
+++ b/manual/po/ro/other_use-cases.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -10,11 +10,12 @@ msgstr ""
 "PO-Revision-Date: 2010-10-03 20:30+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
 #: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
@@ -72,7 +73,7 @@ msgstr ""
 #: en/user_installation.ssi:119 en/user_installation.ssi:136
 #: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
@@ -129,7 +130,7 @@ msgstr ""
 #: en/user_installation.ssi:139 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/other_faq.ssi:85 en/other_faq.ssi:247 en/other_use-cases.ssi:26
diff --git a/manual/po/ro/project_bugs.ssi.po b/manual/po/ro/project_bugs.ssi.po
new file mode 100644
index 0000000..5d2193a
--- /dev/null
+++ b/manual/po/ro/project_bugs.ssi.po
@@ -0,0 +1,498 @@
+# Romanian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"PO-Revision-Date: 2010-10-25 23:27+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/project_bugs.ssi:58 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:224 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:38
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
+#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
+#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
+#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
+#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/project_bugs.ssi:2
+msgid "B~ Reporting bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:4
+msgid "1~bugs Reporting bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:6
+msgid ""
+"Debian Live is far from being perfect, but we want to make it as close as "
+"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"better to fill a report twice than never. However, this chapter includes "
+"recommendations how to file good bug reports."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:8
+msgid "For the impatient:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:10
+msgid ""
+"_* Always check first the image status updates on our homepage at http://"
+"live.debian.net/ for known issues."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:12
+msgid ""
+"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
+"build, live-boot, and live-config before submitting a bug report."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:14
+msgid ""
+"_* Try to give *{as specific information as possible}* about the bug. This "
+"includes (at least) the version of live-build, live-boot, and live-config "
+"used and the distribution of the live system you are building."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:16
+msgid "2~ Known issues"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:18
+msgid ""
+"Due to the nature of Debian testing and Debian unstable distributions being "
+"a moving target, building a live system may not always be possible."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:20
+msgid ""
+"If this is a problem, do not build a system based on testing or unstable, "
+"but go with stable. live-build does always default to the current stable "
+"release."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:22
+msgid ""
+"Currently known issues are listed under the section 'status' on our homepage "
+"at http://live.debian.net/"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:24
+msgid ""
+"It is out of the scope of this manual to train you in correctly identifying "
+"and fixing problems in packages of the development distributions, however, "
+"there are two things you can always try: When not succeeding to build "
+"testing, try if unstable works. If unstable does not work either, revert to "
+"testing and pinning the newer version of the failing package from unstable."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:26
+msgid "2~ Rebuild from scratch"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:28
+msgid ""
+"To ensure that a particular bug is not caused by an unclean built system, "
+"please always rebuild the whole live system from scratch to see if the bug "
+"is reproducible."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:30
+msgid "2~ Use up-to-date packages"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:32
+msgid ""
+"Using outdated packages can cause significant problems when trying to "
+"reproduce (and ultimately fix) your problem."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:34
+msgid "2~collect-information Collect information"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:36
+msgid ""
+"Please provide enough information with your report. At a minimum, it should "
+"contain the exact version of live-build version where the bug is "
+"encountered, and steps to reproduce it. Please use common sense and include "
+"other relevant information if you think that it might help in solving the "
+"problem."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:38
+msgid ""
+"To make the most out of your bug report, we require at least the following "
+"information:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:40
+msgid "_* Architecture of the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:42
+msgid "_* Version of live-build on the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:44
+msgid "_* Version of live-boot on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:46
+#, fuzzy
+#| msgid "3~ No package configuration of the live system"
+msgid "_* Version of live-config on the live system"
+msgstr "3~ Nu vor fi programe de configurare pentru sistemul live."
+
+#. type: Plain text
+#: en/project_bugs.ssi:48
+msgid "_* Version of debootstrap and/or cdebootstrap on the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:50
+#, fuzzy
+#| msgid "3~ No package configuration of the live system"
+msgid "_* Architecture of the live system"
+msgstr "3~ Nu vor fi programe de configurare pentru sistemul live."
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
+#, fuzzy
+#| msgid "3~ No package configuration of the live system"
+msgid "_* Distribution of the live system"
+msgstr "3~ Nu vor fi programe de configurare pentru sistemul live."
+
+#. type: Plain text
+#: en/project_bugs.ssi:54
+msgid "_* Version of the kernel on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:56
+msgid "You can generate a log of the build process by using the tee command:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:60
+msgid "lb build 2>&1 | tee build.log"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:64
+msgid ""
+"Additionally, to rule out other errors, it is always a good idea to tar up "
+"your config directory and upload it somewhere (do *{not}* send it as an "
+"attachment to the mailinglist), so that we can try to reproduce the errors "
+"you encountered."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:66
+msgid ""
+"Remember to send in any logs that were produced with English locale "
+"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
+"{LC_ALL=en_US}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:68
+msgid "2~ Use the correct package to report the bug against"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:70
+msgid "Where does the bug appear?"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:72
+msgid "3~ At build time whilst bootstrapping"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:74
+msgid ""
+"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
+"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"distribution it is bootstrapping, it may fail. If a bug appears here, check "
+"if the error is related to a specific Debian package (most likely), or if it "
+"is related to bootstrapping tool itself."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:76
+msgid ""
+"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
+"which we can not fix this directly. Please report such a bug against the "
+"bootstrapping tool or the failing package."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:78
+msgid "3~ At build time whilst installing packages"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:80
+msgid ""
+"live-build installs additional packages from the Debian archive and "
+"depending on the Debian distribution used and the daily archive state, it "
+"can fail. If a bug appears here, check if the error is also reproducible on "
+"a normal system."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:82
+msgid ""
+"If this is the case, this is not a bug in Debian Live, but rather in Debian "
+"- please report it against the failing package. Running debootstrap "
+"seperately from the Live system build or running lb bootstrap with #{--debug}"
+"# will give you more information."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
+msgid ""
+"Also, if you are using a local mirror and/or any of sort of proxy and you "
+"are experiencing a problem, please always reproduce it first by "
+"bootstrapping from an official mirror."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:86
+msgid "3~ At boot-time"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:88
+msgid ""
+"If your image does not boot, please report it to the mailing list together "
+"with the information requested in {Collect information}#collect-information. "
+"Do not forget to mention, how/when the image failed, in Qemu, VMWare or real "
+"hardware. If you are using a virtualization technology of any kind, please "
+"always run it on real hardware before reporting a bug. Providing a "
+"screenshot of the failure is also very helpful."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:90
+msgid "3~ At run-time"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:92
+msgid ""
+"If a package was successfully installed, but fails while actually running "
+"the Live system, this is probably a bug in Debian Live. However,"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:94
+msgid "2~ Do the research"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:96
+msgid ""
+"Before filing the bug, please search the web for the particular error "
+"message or symptom you are getting. As it is highly unlikely that you are "
+"the only person experiencing a particular problem, there is always a chance "
+"that it has been discussed elsewhere, and a possible solution, patch, or "
+"workaround has been proposed."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:98
+msgid ""
+"You should pay particular attention to the Debian Live mailing list, as well "
+"as the homepage, as these are likely to contain the most up-to-date "
+"information. If such information exists, always include the references to it "
+"in your bug report."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:100
+msgid ""
+"In addition, you should check the current bug lists for live-build, live-"
+"boot, and live-config to see whether something similar has been reported "
+"already."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:102
+msgid "2~ Where to report bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:104
+msgid ""
+"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
+"System (BTS). For information on how to use the system, please see http://"
+"bugs.debian.org/. You can also submit the bugs by using the #{reportbug}# "
+"command from the package with the same name."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:106
+msgid ""
+"In general, you should report build time errors against the live-build "
+"package, boot time errors against live-boot, and run time errors against "
+"live-config. If you are unsure of which package is appropriate or need more "
+"help before submitting a bug report, please send a message to the mailing "
+"list and we will help you to figure it out."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:107
+msgid ""
+"Please note that bugs found in distributions derived from Debian (such as "
+"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
+"can be also reproduced on a Debian system using official Debian packages."
+msgstr ""
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
similarity index 73%
copy from manual/po/de/user_basics.ssi.po
copy to manual/po/ro/user_basics.ssi.po
index e8d344f..2f177d7 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +27,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +87,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,32 +102,40 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_basics.ssi:2
@@ -159,17 +165,11 @@ msgid ""
 "A live system usually means an operating system booted on a computer from a "
 "removable medium (such as CD-ROM, USB stick, or network), ready to use "
 "without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see terms)."
+"done at runtime (see {Terms}#terms )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:14
+#: en/user_basics.ssi:12
 msgid ""
 "With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
 "the supported architectures (currently amd64, i386, powerpc and sparc). It "
@@ -177,17 +177,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:16
+#: en/user_basics.ssi:14
 msgid "_* Linux kernel"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:18
+#: en/user_basics.ssi:16
 msgid "_* The Linux image, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
 msgid ""
 "_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
 "containing modules possibly needed to mount the filesystem's image and some "
@@ -195,10 +195,10 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
 msgid ""
-"_* *{System image}*: The operating systems filesystem image. Debian Live "
-"uses SquashFS, a compressed filesystem, to minimize its image size. Note "
+"_* *{System image}*: The operating systems filesystem image. The SquashFS "
+"compressed filesystem is used to minimize the Debian Live image size. Note "
 "that it's read-only. So, during boot the Debian Live system will use a RAM "
 "disk and 'union' mechanism to enable writing files within the running "
 "system. However, all modifications will be lost upon shutdown unless "
@@ -206,12 +206,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid "% FIXME: <xref linkend=\"persistence\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid ""
 "_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -225,7 +225,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "_* live-build will build the system image from your specifications, setup a "
 "Linux kernel and its initrd, a bootloader to run them, all in one media-"
@@ -233,12 +233,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
 msgid ""
 "The following sequence of commands, provided by live-build, will create a "
 "basic ISO image containing just the Debian standard system without X.org. It "
@@ -246,129 +246,135 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
 msgid ""
 "By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see lb-config)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
+"the defaults (see {The lb config command}#lb-config )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:46
+#: en/user_basics.ssi:42
 msgid ""
 "Now that we have a \"config/\" hierarchy, we may build the image with the lb "
 "build command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50 en/user_basics.ssi:122 en/user_basics.ssi:204
+#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:50
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see lb-build)."
+"connection (see {The lb build command}#lb-build )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:52
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:54
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64 en/user_basics.ssi:144
+#: en/user_basics.ssi:58 en/user_basics.ssi:146
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:60
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:64
 msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:66
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:70
 msgid "# apt-get install virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:74
 msgid ""
 "and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
 "build the required kernel modules to run virtualbox-ose."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:82
+#: en/user_basics.ssi:76
 msgid ""
 "After successful installation, virtualbox can be e.g. found in the GNOME "
 "menu under 'Applications/System Tools/VirtualBox OSE'."
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:78
+msgid ""
+"Please consider including of following packages onto the live image to "
+"achieve higher resolution of the display when booting the live image in "
+"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
+"default resolution of the virtualbox-ose display shouldn't work with the gui-"
+"installer)."
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:84
+msgid ""
+"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:88
 msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:90
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:94
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:96
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:100
 msgid "2~ Building an USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:102
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -377,46 +383,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:104
 msgid ""
 "Note if you created an iso image with the previous example, you will need to "
-"clean up your working directory with the #{lb clean} command (see lb-clean):"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:102
-msgid "% FIXME: <xref linkend=\"lb-clean\"/>"
+"clean up your working directory with the #{lb clean} command (see {The lb "
+"clean command}#lb-clean ):"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:106 en/user_basics.ssi:186
+#: en/user_basics.ssi:108 en/user_basics.ssi:188
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:112
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:114
+#: en/user_basics.ssi:116
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:118
+#: en/user_basics.ssi:120
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:128
 msgid "3~ Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:130
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on an USB stick. Plug in an USB "
@@ -424,12 +426,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:132
+#: en/user_basics.ssi:134
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:138
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -437,28 +439,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:140
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:142
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:148
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:154
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -467,45 +469,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:158
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:162
 msgid ""
 "Ater the creation of the partition you have to create a filsystem on it. One "
 "possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
+#: en/user_basics.ssi:166
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:170
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
+#: en/user_basics.ssi:174
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:178
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -513,28 +515,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:184
 msgid ""
 "Note if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:192
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
+#: en/user_basics.ssi:196
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
 msgid ""
 "In contrast with the ISO and USB hdd images, netbooting does not support "
 "serving a filesystem image with the client so the files must be served via "
@@ -544,12 +546,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:202
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
 msgid ""
 "In a network boot the client runs a small piece of software, which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -560,7 +562,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
@@ -569,17 +571,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the computer netbooting, and to advertise the location of the PXE "
@@ -587,25 +589,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:220
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
 "dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:226
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:229
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -613,7 +615,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:232
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -621,7 +623,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -631,7 +633,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:241
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -640,7 +642,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:244
 #, no-wrap
 msgid ""
 "    # PXE boot loader (first program to be loaded, by TFTP)\n"
@@ -648,7 +650,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:247
 #, no-wrap
 msgid ""
 "  }\n"
@@ -656,17 +658,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
 msgid "This serves the kernel and initial ramdisk to the system at run-time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:255
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
 "inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -674,27 +676,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
-msgid "dpkg-reconfigure -plow tftpd-hpa"
-msgstr ""
-
-#. type: Plain text
 #: en/user_basics.ssi:259
-msgid "code}"
+msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -702,35 +699,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:271
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:275
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:279
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:283
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -739,40 +736,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:291
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:299
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:310
 msgid ""
 "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
 "\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -781,62 +778,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:324
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:332
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:338
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:341
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:344
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:349
 msgid ""
 "ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
 "83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -844,19 +841,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:355
 msgid ""
 "_* Double click on this file (or run VMWare player and selecet this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:356
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/ro/user_customization-contents.ssi.po
similarity index 66%
copy from manual/po/de/user_customization-contents.ssi.po
copy to manual/po/ro/user_customization-contents.ssi.po
index be9ddad..5bde24d 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/ro/user_customization-contents.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +27,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +87,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,52 +102,54 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:2
-msgid "B~ Customising contents"
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid "B~ Customizing contents"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:4
-msgid "1~ Customising contents"
+msgid "1~customizing-contents Customizing contents"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:6
-msgid "This chapter discusses further customisation of the live system."
+msgid "This chapter discusses further customization of the live system."
 msgstr ""
 
 #. type: Plain text
@@ -210,6 +210,11 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+#: en/user_customization-contents.ssi:26
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-contents.ssi:28
 msgid "3~ Live/chroot local includes"
 msgstr ""
diff --git a/manual/po/ro/user_customization-internationalization.ssi.po b/manual/po/ro/user_customization-internationalization.ssi.po
new file mode 100644
index 0000000..5f8e2c7
--- /dev/null
+++ b/manual/po/ro/user_customization-internationalization.ssi.po
@@ -0,0 +1,219 @@
+# Romanian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"PO-Revision-Date: 2010-10-22 08:57-0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:2
+msgid "B~ Customizing locale and language"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:4
+msgid "1~customizing-locale-and-language Customizing locale and language"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:6
+msgid "2~ Default locale and keyboard"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:8
+msgid ""
+"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
+"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:12
+msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:16
+msgid "The entry for a Swiss-German keyboard would be:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:20
+msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:24
+msgid "Combined, the keyboard and locale configured for Switzerland would be:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:28
+msgid ""
+"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:32
+msgid ""
+"Note: You can find a list of options in the manpage for live-config. "
+"Currently, only UTF-8 locales are supported."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:34
+msgid "2~ l10n Packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:36
+msgid ""
+"An experimental feature of live-build is to automatically check for each "
+"package for which it is know that there are -l10n packages available and "
+"install them. To add German packages the entry would be"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:40
+msgid "$ lb config --language \"de\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:43
+msgid ""
+"This will also change the default syslinux language if translations are "
+"available or local translations have been put into #{config/templates/"
+"syslinux/de}#."
+msgstr ""
diff --git a/manual/po/ro/user_customization-overview.ssi.po b/manual/po/ro/user_customization-overview.ssi.po
new file mode 100644
index 0000000..291851a
--- /dev/null
+++ b/manual/po/ro/user_customization-overview.ssi.po
@@ -0,0 +1,45 @@
+# Romanian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"PO-Revision-Date: 2010-10-22 08:57-0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid "B~ Customizing contents"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:4
+msgid "1~customization-overview Customization overview"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:7
+msgid ""
+"% FIXME: just a stub for now.  In conversational style, cover the different "
+"kinds of customization % and link to each section within the text."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:9
+msgid ""
+"This chapter gives an overview of the various ways in which your Debian live "
+"systems may be customized. See sections {Customizing package installation}"
+"#customizing-package-installation, {Customizing contents}#customizing-"
+"contents and {Customizing locale and language}#customizing-locale-and-"
+"language."
+msgstr ""
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
similarity index 76%
copy from manual/po/de/user_customization-packages.ssi.po
copy to manual/po/ro/user_customization-packages.ssi.po
index e2d0159..939dfaf 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 08:58-0200\n"
+"PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +27,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +87,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,45 +103,53 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
-#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+#: en/user_basics.ssi:230 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:2
-msgid ":B~ Customising package installation"
+msgid ":B~ Customizing package installation"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:4
-msgid "1~ Customising package installation"
+msgid "1~customizing-package-installation Customizing package installation"
 msgstr ""
 
 #. type: Plain text
@@ -461,16 +467,39 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:145
 #, no-wrap
+msgid "*{Local binary packages lists}*\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:147
+msgid ""
+"In case you want to include some required .deb packages to live media's "
+"pool/ (without installing them onto the live image) you may need to use "
+"lists using binary local package lists stored in #{config/binary_local-"
+"packageslists}#. Such media can be used as a customized debian install image "
+"for offline installations."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:149
+msgid ""
+"Package lists that exist in this directory need to have a .list suffix in "
+"order to be processed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:151
+#, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:160
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:162
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -478,75 +507,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:164
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:170
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:174
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:180
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:184
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:190
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:194
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:200
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:198
+#: en/user_customization-packages.ssi:204
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
 "in this way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:200
+#: en/user_customization-packages.ssi:206
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:202
+#: en/user_customization-packages.ssi:208
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:210
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:212
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:214
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -557,7 +586,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:216
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -568,35 +597,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:218
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:220
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:222
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:224
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
-"\" customisations but has a number of drawbacks, whilst using a custom APT "
+"\" customizations but has a number of drawbacks, whilst using a custom APT "
 "repository is more time-consuming to set up."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:226
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:228
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -605,45 +634,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:230
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:232
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:234
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:236
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:238
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:240
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:242
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -651,12 +680,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:244
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:246
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -664,12 +693,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:248
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:250
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -679,7 +708,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:252
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -689,17 +718,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:254
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:256
 msgid "3~ Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:257
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/ro/user_installation.ssi.po
similarity index 61%
copy from manual/po/de/user_installation.ssi.po
copy to manual/po/ro/user_installation.ssi.po
index 5e0e898..0e3f89d 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/ro/user_installation.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +27,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +87,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,44 +102,40 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:32
-#: en/user_installation.ssi:44
-msgid "or"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_installation.ssi:2
@@ -243,6 +237,11 @@ msgid "# apt-get install live-build"
 msgstr ""
 
 #. type: Plain text
+#: en/user_installation.ssi:44
+msgid "or"
+msgstr ""
+
+#. type: Plain text
 #: en/user_installation.ssi:48
 msgid "# aptitude install live-build"
 msgstr ""
@@ -296,17 +295,17 @@ msgid "and uninstall it with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:87
-msgid "# make uninstall }code"
+#: en/user_installation.ssi:86
+msgid "# make uninstall"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:89
+#: en/user_installation.ssi:90
 msgid "3~ From 'snapshots'"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:91
+#: en/user_installation.ssi:92
 msgid ""
 "If you do not wish to build or install live-build from source, you can use "
 "snapshots. These are built automatically from the latest version in Git and "
@@ -314,45 +313,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:93
+#: en/user_installation.ssi:94
 msgid "2~ live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:95
+#: en/user_installation.ssi:96
 #, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customised Debian Live systems. However, doing so will do no harm.\n"
+msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:97
-msgid "3~ Using a customised live-boot"
+#: en/user_installation.ssi:98
+msgid "3~ Using a customized live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:99
+#: en/user_installation.ssi:100
 msgid ""
 "To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in terms."
+"familiar with the terms mentioned in {Terms}#terms ."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:103
+#: en/user_installation.ssi:102
 msgid "_* Checkout the live-boot source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:107
+#: en/user_installation.ssi:106
 msgid "$ git clone git://live.debian.net/git/live-boot.git"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:111
+#: en/user_installation.ssi:110
 msgid "_* Make changes to your local copy"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:113
+#: en/user_installation.ssi:112
 msgid ""
 "And beware that if you want to add your pre-init script in live-bottom, you "
 "should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -360,33 +359,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:115
+#: en/user_installation.ssi:114
 msgid "_* Build a live-boot .deb"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:117
+#: en/user_installation.ssi:116
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is squeeze then you should "
-"build against squeeze. You can use a personal builder such as /{pbuilder}/ "
+"your target platform: this means if your target is Squeeze then you should "
+"build against Squeeze. You can use a personal builder such as /{pbuilder}/ "
 "or /{sbuild}/ to automate building packages in chroot. To build directly on "
 "the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ "
 "package):"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:121
 msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:126
+#: en/user_installation.ssi:125
 msgid "_* Use the generated live-boot .deb"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:128
+#: en/user_installation.ssi:127
 msgid ""
 "As live-boot is installed by live-build system, installing the package in "
 "the host system is not sufficient: you should treat the generated .deb like "
@@ -395,19 +394,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:130
+#: en/user_installation.ssi:129
 msgid ""
 "% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
 "apt\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:132
+#: en/user_installation.ssi:131
 msgid "3~ Using live-boot snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:134
+#: en/user_installation.ssi:133
 msgid ""
 "You can let live-build automatically use the latest snapshot of live-boot by "
 "configuring a third-party repository in your live-build configuration "
@@ -416,6 +415,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:138
+#: en/user_installation.ssi:137
 msgid "lb config --repository live.debian.net"
 msgstr ""
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
new file mode 100644
index 0000000..bbe1905
--- /dev/null
+++ b/manual/po/ro/user_managing_a_configuration.ssi.po
@@ -0,0 +1,269 @@
+# Romanian translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-13 17:00+0300\n"
+"PO-Revision-Date: 2010-10-13 17:00+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:88 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
+msgid "code{"
+msgstr "code{"
+
+#. type: Plain text
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
+msgid "}code"
+msgstr "}code"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:2
+msgid ":B~ Managing a configuration"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:4
+msgid "1~ Managing a configuration"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:6
+msgid ""
+"This chapter explains how to manage a live configuration from initial "
+"creation, through successive revisions and successive releases of both the "
+"live-build software and the live image itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:8
+msgid "2~ Use auto to manage configuration changes"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:10
+msgid ""
+"Live configurations rarely are perfect on the first try. You'll likely need "
+"to make a series of revisions until you are satisfied. However, "
+"inconsistencies can creep into your configuration from one revision to the "
+"next if you aren't careful. The main problem is, once a variable is given a "
+"default value, that value will not be recomputed from other variables that "
+"may change in later revisions."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:12
+msgid ""
+"For example, when the distribution is first set, many 'dependent' variables "
+"are given default values that suit that distribution. However, if you later "
+"decide to change the distribution, those dependent variables continue to "
+"retain old values that are no longer appropriate."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:14
+msgid ""
+"A second, related problem is that if you run #{lb config}# and then upgrade "
+"to a new version of live-build that has changed one of the variable names, "
+"you will discover this only by manual review of the variables in your config "
+"files, which you will then need to use to set the appropriate option again."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:16
+msgid ""
+"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
+"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
+"that are designed to help you manage your configuration. Simply create an "
+"auto/config script containing #{lb config}# command with all desired "
+"options, and an auto/clean that removes the files containing configuration "
+"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"files will be executed. This will ensure that your configuration is kept "
+"internally consistent from one revision to the next and from one live-build "
+"release to the next (though you will still have to take care and read the "
+"documentation when you upgrade live-build and make adjustments as needed)."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:18
+msgid "2~ Example auto scripts"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:20
+msgid ""
+"Use the following auto script examples as the starting point for your new "
+"live-build configuration. Take note that when you call the #{lb}# command "
+"that the auto script wraps, you must specify #{noauto}# as its parameter to "
+"ensure that the auto script isn't called again, recursively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:22
+msgid "auto/config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:29
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"lb config noauto \\\n"
+"\t--architecture i386 \\\n"
+"\t${@}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:33
+msgid "auto/clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:41
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"lb clean noauto ${@}\n"
+"rm -f config/binary config/bootstrap \\\n"
+"\tconfig/chroot config/common config/source\n"
+"rm -f binary.log\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:45
+msgid "auto/build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:50
+msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:54
+msgid ""
+"Edit auto/config, changing or adding any options as you see fit. In the "
+"example above, --architecture is set to i386 so that when the image is built "
+"on an amd64 system, it will not default to building amd64 images. Change "
+"this to an appropriate value for your image (or delete it if you want to use "
+"the default) and add any additional options in continuation lines that "
+"follow."
+msgstr ""
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/ro/user_overview.ssi.po
similarity index 66%
copy from manual/po/de/user_overview.ssi.po
copy to manual/po/ro/user_overview.ssi.po
index d8c8b3c..22efbcb 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/ro/user_overview.ssi.po
@@ -1,4 +1,4 @@
-# German translations for live-manual package
+# Romanian translations for live-manual package
 # Copyright (C) 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the live-manual package.
 # Automatically generated, 2010.
@@ -6,19 +6,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
-"Language: de\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +27,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
-msgstr ""
+msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +87,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,41 +103,39 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
+msgstr "}code"
 
 #. type: Plain text
 #: en/user_overview.ssi:2
@@ -154,13 +150,13 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:6
 msgid ""
-"This chapter contains an overview of the two main tools used in building "
-"Debian Live systems."
+"This chapter contains an overview of the three main tools used in building "
+"Debian Live systems: live-build, live-boot and live-config."
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~ live-build"
+msgid "2~live-build live-build"
 msgstr ""
 
 #. type: Plain text
@@ -209,11 +205,11 @@ msgid ""
 "Unlike debhelper, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
 "similar to tools such as #{dh-make}#. For more information about #{lb config}"
-"#, please see lb-config."
+"#, please see {The lb config command}#lb-config."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:24
+#: en/user_overview.ssi:22
 msgid ""
 "Besides the common config/common, which is used by all live-build commands, "
 "some additional files can be used to configure the behavior of specific "
@@ -223,7 +219,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:26
+#: en/user_overview.ssi:24
 msgid ""
 "For example, the #{lb_bootstrap_debootstrap}# command uses files named "
 "config/bootstrap and config/bootstrap_debootstrap to read the options it "
@@ -233,7 +229,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:28
+#: en/user_overview.ssi:26
 msgid ""
 "live-build respects environment variables which are present in the context "
 "of the shell it is running. If variables can be read from config files, then "
@@ -244,7 +240,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:30
+#: en/user_overview.ssi:28
 msgid ""
 "All config files are shell scripts which are sourced by a live-build "
 "command. That means they have to follow the normal shell syntax. You can "
@@ -252,7 +248,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:32
+#: en/user_overview.ssi:30
 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."
@@ -264,87 +260,68 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:34
-msgid "Please see installation for information on how to install live-build."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:36
-msgid "% FIXME: <xref linkend=\"installation\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:38
+#: en/user_overview.ssi:32
 msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:34
 msgid ""
-"_* *{lb config}*: Responsible for initialising a Live system configuration "
-"directory. See lb-config for more information."
+"_* *{lb config}*: Responsible for initializing a Live system configuration "
+"directory. See {The lb config command}#lb-config for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:36
 msgid ""
-"_* *{lb build}*: Responsible for starting a Live system build. See lb-build "
-"for more information."
+"_* *{lb build}*: Responsible for starting a Live system build. See {The lb "
+"build command}#lb-build for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:48
+#: en/user_overview.ssi:38
 msgid ""
 "_* *{lb clean}*: Responsible for removing parts of a Live system build. See "
-"lb-clean for more information."
+"{The lb clean command}#lb-clean for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:50
-msgid "% FIXME: <xref linkend=\"lb-clean\"/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:52
-msgid "3~ The #{lb config}# command"
+#: en/user_overview.ssi:40
+msgid "3~lb-config The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:42
 msgid ""
-"As discussed in live-build, the scripts that make up live-build source their "
-"configuration from a single directory named config/. As constructing this "
-"directory by hand would be time-consuming and error-prone, the #{lb config}# "
-"command can be used to create skeleton configuration folders."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:56
-msgid "% FIXME: <xref linkend=\"live-build\"/>"
+"As discussed in {live-build}#live-build, the scripts that make up live-build "
+"source their configuration from a single directory named config/. As "
+"constructing this directory by hand would be time-consuming and error-prone, "
+"the #{lb config}# command can be used to create skeleton configuration "
+"folders."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:58
+#: en/user_overview.ssi:44
 msgid ""
 "Issuing #{lb config}# without any arguments creates a config subdirectory "
 "which it populates with some default settings:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:63
+#: en/user_overview.ssi:49
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:68
+#: en/user_overview.ssi:54
 msgid ""
 "$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22 "
 "user user 4096 Sep 7 13:02 config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:82
 msgid ""
 "$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary "
 "drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2 "
@@ -369,7 +346,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:86
 msgid ""
 "Using #{lb config}# without any arguments would be suitable for users who "
 "are either happy editing the generated files, or are simply happy with the "
@@ -377,7 +354,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:88
 msgid ""
 "You can ask #{lb config}# to generate a config/ directory \"preseeded\" with "
 "various options. This might be suitable if you do not require the default "
@@ -385,38 +362,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:92
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:96
 msgid ""
 "will build a config/ directory configured to include the 'gnome' package "
 "list. It is possible to specify many options:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:114
+#: en/user_overview.ssi:100
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
+#: en/user_overview.ssi:104
 msgid ""
 "A full list of options is available in the #{lb_config}# man page. Most "
 "options have a parallel with an \"LB_\" prefixed variable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
-msgid "3~ The #{lb build}# command"
+#: en/user_overview.ssi:106
+msgid "3~lb-build The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:122
+#: en/user_overview.ssi:108
 msgid ""
 "The #{lb build}# command reads in your configuration from the config/ "
 "directory. It then runs the lower lower level commands needed to build your "
@@ -424,24 +401,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
-msgid "3~ The #{lb clean}# command"
+#: en/user_overview.ssi:110
+msgid "3~lb-clean The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:126
+#: en/user_overview.ssi:112
 msgid ""
 "It is the job of the #{lb clean}# command to remove various parts of a build "
 "so subsequent builds can start from a clean state."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:128
-msgid "2~ The live-boot package"
+#: en/user_overview.ssi:114
+msgid "2~live-boot The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:130
+#: en/user_overview.ssi:116
 msgid ""
 "live-boot is a collection of scripts providing hooks for the initramfs-"
 "tools, used to generate an initramfs capable of booting live systems, such "
@@ -450,7 +427,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:132
+#: en/user_overview.ssi:118
 msgid ""
 "At boot time it will look for read-only media containing a \"/live\" "
 "directory where a root filesystem (often a compressed filesystem image like "
@@ -459,9 +436,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:133
+#: en/user_overview.ssi:120
 msgid ""
 "More information on initial ramfs in Debian can be found in the Debian Linux "
 "Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
 "on initramfs."
 msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:122
+msgid "2~live-config The live-config package"
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:124
+msgid ""
+"live-config consists of the scripts that run at boot time after live-boot to "
+"configure the live system automatically. It handles such tasks as setting "
+"the hostname, locales and timezone, creating the live user, inhibiting cron "
+"jobs and performing autologin of the live user."
+msgstr ""
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index e992ed7..8b43a9c 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -1,4 +1,4 @@
-[po4a_langs] de
+[po4a_langs] de fr pt_BR ro
 [po4a_paths] pot/$master.pot $lang:po/$lang/$master.po
 [type: text] en/live-manual.ssm $lang:$lang/live-manual.ssm
 [type: text] en/about_manual.ssi $lang:$lang/about_manual.ssi
@@ -10,19 +10,21 @@
 [type: text] en/other_customization-backports.ssi $lang:$lang/other_customization-backports.ssi
 [type: text] en/other_customization-binary.ssi $lang:$lang/other_customization-binary.ssi
 [type: text] en/other_customization-bootup.ssi $lang:$lang/other_customization-bootup.ssi
-[type: text] en/other_customization-internationalization.ssi $lang:$lang/other_customization-internationalization.ssi
 [type: text] en/other_faq.ssi $lang:$lang/other_faq.ssi
 [type: text] en/other_howtos.ssi $lang:$lang/other_howtos.ssi
 [type: text] en/other_live-environment.ssi $lang:$lang/other_live-environment.ssi
 [type: text] en/other_procedures.ssi $lang:$lang/other_procedures.ssi
-[type: text] en/other_reporting-bugs.ssi $lang:$lang/other_reporting-bugs.ssi
 [type: text] en/other_resources.ssi $lang:$lang/other_resources.ssi
 [type: text] en/other_success-stories.ssi $lang:$lang/other_success-stories.ssi
 [type: text] en/other_troubleshooting.ssi $lang:$lang/other_troubleshooting.ssi
 [type: text] en/other_use-cases.ssi $lang:$lang/other_use-cases.ssi
+[type: text] en/project_bugs.ssi $lang:$lang/project_bugs.ssi
 [type: text] en/user_basics.ssi $lang:$lang/user_basics.ssi
 [type: text] en/user_customization-contents.ssi $lang:$lang/user_customization-contents.ssi
+[type: text] en/user_customization-internationalization.ssi $lang:$lang/user_customization-internationalization.ssi
+[type: text] en/user_customization-overview.ssi $lang:$lang/user_customization-overview.ssi
 [type: text] en/user_customization-packages.ssi $lang:$lang/user_customization-packages.ssi
 [type: text] en/user_installation.ssi $lang:$lang/user_installation.ssi
+[type: text] en/user_managing_a_configuration.ssi $lang:$lang/user_managing_a_configuration.ssi
 [type: text] en/user_overview.ssi $lang:$lang/user_overview.ssi
 [type: xhtml] en/index.html.in $lang:$lang/index.html.in
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index eeaafc6..2a693c2 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -48,7 +48,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:10
-msgid "2~ Terms"
+msgid "2~terms Terms"
 msgstr ""
 
 #. type: Plain text
@@ -57,8 +57,8 @@ msgid ""
 "_* *{Live system}*: An operating system that can boot without installation "
 "to a hard drive. Live systems do not alter local operating system(s) or file"
 "(s) already installed on the computer hard drive unless instructed to do so. "
-"Live systems are typically booted from media such as CDs/DVDs or USB sticks, "
-"some may also boot over the network."
+"Live systems are typically booted from media such as CDs, DVDs or USB "
+"sticks. Some may also boot over the network."
 msgstr ""
 
 #. type: Plain text
@@ -73,7 +73,7 @@ msgstr ""
 msgid ""
 "_* *{Debian Live system}*: A live system that uses software from the Debian "
 "operating system that may be booted from CDs, DVDs, USB sticks, over the "
-"network (via netboot images), and over the internet (via boot parameter #"
+"network (via netboot images), and over the Internet (via boot parameter #"
 "{fetch=URL}#)."
 msgstr ""
 
@@ -97,15 +97,15 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:24
 msgid ""
-"_* *{live-build}*: A collection of scripts used to build customised Debian "
-"Live systems. live-build was formerly know as live-helper, and even earlier "
-"know as live-package."
+"_* *{live-build}*: A collection of scripts used to build customized Debian "
+"Live systems. live-build was formerly known as live-helper, and even earlier "
+"known as live-package."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:26
 msgid ""
-"_* *{live-config}*: A collection of scripts used to configure a live systems "
+"_* *{live-config}*: A collection of scripts used to configure a live system "
 "during the boot process. live-config was formerly a part of live-initramfs."
 msgstr ""
 
@@ -119,7 +119,7 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:30
 msgid ""
-"_* *{Debian Installer/(d-i)}*: The official installation system for the "
+"_* *{Debian Installer (d-i)}*: The official installation system for the "
 "Debian distribution."
 msgstr ""
 
@@ -141,21 +141,21 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:36
 msgid ""
-"_* *{Binary image}*: On a live system, binary image refers to the binary "
-"filesystem and the respective extension, such as binary.iso or binary.img."
+"_* *{Binary image}*: A file containing the live system, such as binary.iso "
+"or binary.img."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:38
 msgid ""
 "_* *{Target distribution}*: The distribution upon which your live system "
-"will be based. This can differ from the distribution of your Build System."
+"will be based. This can differ from the distribution of your host system."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:40
 msgid ""
-"_* *{squeeze/wheezy/sid stable/testing/unstable}*: The stable distribution "
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
 "contains the latest officially released distribution of Debian. The testing "
 "distribution is the staging area for the next stable release. A major "
 "advantage of using this distribution is that it has more recent versions of "
@@ -167,8 +167,8 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:42
 msgid ""
-"At the time of writing, squeeze is the current stable release and wheezy is "
-"the current testing release. sid will always be a synonym for the unstable "
+"At the time of writing, Squeeze is the current stable release and Wheezy is "
+"the current testing release. Sid will always be a synonym for the unstable "
 "release."
 msgstr ""
 
@@ -252,34 +252,29 @@ msgstr ""
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see contact "
-"for more information."
+"submit a contribution is to send it to the mailing list. Please see {Contact}"
+"#contact for more information."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:76
-msgid "% FIXME: <xref linkend=\"contact\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:78
 msgid ""
-"When submitting a contribution please clearly identify its copyright holder "
-"and include the licensing statement. Note that to be accepted the "
+"When submitting a contribution, please clearly identify its copyright holder "
+"and include the licensing statement. Note that to be accepted, the "
 "contribution must be licensed under the same license as the rest of the "
-"document, namely GPL version 3 or later."
+"document, namely, GPL version 3 or later."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:78
 msgid ""
 "The sources for this manual are maintained using the Git version control "
 "system. You can checkout the latest copy by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -287,61 +282,63 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:84
+#: en/about_manual.ssi:82
 msgid "$ git clone git://live.debian.net/git/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -350,17 +347,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -370,35 +362,43 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:88
+#: en/about_manual.ssi:86
 msgid ""
 "Prior to submission of your contribution, please preview your work. To "
 "preview the live-manual, ensure the packages needed for building are "
@@ -406,49 +406,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:92
-msgid "# apt-get install sisu-complete"
+#: en/about_manual.ssi:90
+msgid "# apt-get install make po4a sisu-complete"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:96
+#: en/about_manual.ssi:94
 msgid ""
 "You may build the live-manual from the top level directory of your git "
 "checkout by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:100
+#: en/about_manual.ssi:98
 msgid "$ make build"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:102
 msgid "3~ Applying patches"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:104
 msgid ""
 "Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailinglist to discuss them first. In "
+"you to send bigger changes to the mailing list to discuss them first. In "
 "order to push to the repository, the following steps are required."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:108
+#: en/about_manual.ssi:106
 msgid "_* Fetch the public commit key:"
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:115
+#, no-wrap
 msgid ""
-"$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/"
-"repository-public-commit-key-current/live-manual at debian-live -O ~/.ssh/"
-"identity.d/live-manual at debian-live $ wget http://live.debian.net/other/"
-"openssh/repository-public-commit-key-current/live-manual at debian-live.pub -O "
-"~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600 ~/.ssh/identity.d/"
-"live-manual at debian-live*"
+"$ mkdir -p ~/.ssh/identity.d\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
+"$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
 msgstr ""
 
 #. type: Plain text
@@ -482,7 +483,7 @@ msgstr ""
 #: en/about_manual.ssi:140
 msgid ""
 "_* After editing the files in manual/en/, please call the 'commit' target in "
-"the toplevel directory to sanitize the files and update the translation "
+"the top level directory to sanitize the files and update the translation "
 "files:"
 msgstr ""
 
diff --git a/manual/pot/about_project.ssi.pot b/manual/pot/about_project.ssi.pot
index 6887cca..5e4edf1 100644
--- a/manual/pot/about_project.ssi.pot
+++ b/manual/pot/about_project.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -192,20 +192,15 @@ msgstr ""
 #. type: Plain text
 #: en/about_project.ssi:60
 msgid ""
-"A system for configuring packages is provided using debconf in #{lh config}# "
+"A system for configuring packages is provided using debconf in #{lb config}# "
 "(use --preseed FILE) allowing custom configured packages to be installed in "
 "your custom produced Debian Live images, but for official live images only "
 "default configuration will be used. For more information, please see "
-"customization."
+"{Customization overview}#customization-overview."
 msgstr ""
 
 #. type: Plain text
 #: en/about_project.ssi:62
-msgid "% FIXME: <xref linkend=\"customization\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:64
 msgid ""
 "Exception: There are a few essential changes needed to bring a live system "
 "to life (e.g. configuring pam to allow empty passwords). These essential "
@@ -214,12 +209,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:66
-msgid "2~ Contact"
+#: en/about_project.ssi:64
+msgid "2~contact Contact"
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:68
+#: en/about_project.ssi:66
 msgid ""
 "_* *{Mailing list}*: The primary contact for the project is the mailing list "
 "at http://lists.debian.org/debian-live/. You can email the list directly by "
@@ -228,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:70
+#: en/about_project.ssi:68
 msgid ""
 "_* *{IRC}*: A number of users and developers are present in the #debian-live "
 "channel on irc.debian.org (OFTC). When asking a question on IRC, please be "
@@ -237,21 +232,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:72
+#: en/about_project.ssi:70
 msgid ""
 "_* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs "
 "reported by users and developers. Each bug is given a number, and is kept on "
 "file until it is marked as having been dealt with. For more information, "
-"please see bugs."
-msgstr ""
-
-#. type: Plain text
-#: en/about_project.ssi:74
-msgid "% FIXME: <xref linkend=\"bugs\"/>"
+"please see {Reporting bugs}#bugs."
 msgstr ""
 
 #. type: Plain text
-#: en/about_project.ssi:75
+#: en/about_project.ssi:71
 msgid ""
 "_* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a "
 "place to gather information, discuss applied technologies, and document "
diff --git a/manual/pot/index.html.in.pot b/manual/pot/index.html.in.pot
index facd290..ca7bcc5 100644
--- a/manual/pot/index.html.in.pot
+++ b/manual/pot/index.html.in.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-20 20:02+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -36,8 +36,8 @@ msgstr ""
 msgid ""
 "Please report errors, omissions, patches and suggestions to our mailinglist "
 "at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/meta.html#contributing\">how to "
-"contribute</a> to the manual."
+"org</a> and read about <a href=\"html/1.html#37\">how to contribute</a> to "
+"the manual."
 msgstr ""
 
 #. type: Content of: <html><body><h3>
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index b5ed00f..e7a1a29 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-25 23:12+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2010-10-03\n"
+" :published: 2010-10-25\n"
 msgstr ""
 
 #. type: Plain text
@@ -58,7 +58,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@make:\n"
-" :bold: /lenny|stable|squeeze|testing|sid|unstable/\n"
+" :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/\n"
 " :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
 " :num_top: 1\n"
 " :skin: skin_debian-live\n"
@@ -106,110 +106,130 @@ msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:39
-msgid "<< user_customization-packages.ssi"
+msgid "<< user_managing_a_configuration.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:41
-msgid "<< user_customization-contents.ssi"
+msgid "<< user_customization-overview.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:43
-msgid ":B~ Development ~#"
+msgid "<< user_customization-packages.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:45
-msgid ":B~ Project ~#"
+msgid "<< user_customization-contents.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:47
-msgid ":B~ Other ~#"
+msgid "<< user_customization-internationalization.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:49
-msgid "<< other_customization-internationalization.ssi"
+msgid ":B~ Development ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:51
-msgid "<< other_customization-bootup.ssi"
+msgid ":B~ Project ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:53
-msgid "<< other_customization-binary.ssi"
+msgid "<< project_bugs.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:55
-msgid "<< other_customization-backports.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:57
-msgid "<< other_common-tasks.ssi"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:59
-msgid "<< other_live-environment.ssi"
+msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:61
-msgid "<< other_faq.ssi"
+msgid ""
+"Other material that formerly appeared in this section is out of date and/or "
+"has not been approved for release. It has therefore been omitted, but can "
+"still be found in the document source; see 'About this manual'. Any part of "
+"the omitted material that is still useful will be included in the release "
+"only after it has been reviewed."
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:63
-msgid "<< other_reporting-bugs.ssi"
+msgid "% << other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:65
-msgid "<< other_howtos.ssi"
+msgid "% << other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:67
-msgid "<< other_coding-style.ssi"
+msgid "% << other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:69
-msgid "<< other_procedures.ssi"
+msgid "% << other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:71
-msgid "<< other_resources.ssi"
+msgid "% << other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:73
-msgid "<< other_use-cases.ssi"
+msgid "% << other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:75
-msgid "<< other_success-stories.ssi"
+msgid "% << other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:77
-msgid "<< other_troubleshooting.ssi"
+msgid "% << other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
 #: en/live-manual.ssm:79
-msgid "<< other_configuration-layout.ssi"
+msgid "% << other_procedures.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:81
+msgid "% << other_resources.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:83
+msgid "% << other_use-cases.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:85
+msgid "% << other_success-stories.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:87
+msgid "% << other_troubleshooting.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:89
+msgid "% << other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:80
-msgid "<< other_configuration-files.ssi"
+#: en/live-manual.ssm:90
+msgid "% << other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/pot/other_common-tasks.ssi.pot b/manual/pot/other_common-tasks.ssi.pot
index b0c7ea0..d432b89 100644
--- a/manual/pot/other_common-tasks.ssi.pot
+++ b/manual/pot/other_common-tasks.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,84 +17,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,28 +102,36 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
@@ -190,7 +195,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_common-tasks.ssi:18
 msgid ""
-"This whole process can be preseeded and customised in a number of ways; see "
+"This whole process can be preseeded and customized in a number of ways; see "
 "the relevant \"DebianInstaller\" wiki page and installation guide for more. "
 "This is operational now withing live-helper."
 msgstr ""
diff --git a/manual/pot/other_customization-binary.ssi.pot b/manual/pot/other_customization-binary.ssi.pot
index d61c183..5882398 100644
--- a/manual/pot/other_customization-binary.ssi.pot
+++ b/manual/pot/other_customization-binary.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/other_customization-binary.ssi:2
-msgid "B~ Customising the binary image"
+msgid "B~ Customizing the binary image"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-binary.ssi:4
-msgid "1~ Customising the binary image<"
+msgid "1~ Customizing the binary image<"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/other_customization-bootup.ssi.pot b/manual/pot/other_customization-bootup.ssi.pot
index bb11a29..5e06cac 100644
--- a/manual/pot/other_customization-bootup.ssi.pot
+++ b/manual/pot/other_customization-bootup.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,84 +17,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,46 +102,54 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:2
-msgid "B~ Customising the bootup process"
+msgid "B~ Customizing the bootup process"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:4
-msgid "1~ Customising the bootup process"
+msgid "1~ Customizing the bootup process"
 msgstr ""
 
 #. type: Plain text
 #: en/other_customization-bootup.ssi:6
 msgid ""
-"This chapter discusses customisation of bootup process of a live system, "
+"This chapter discusses customization of bootup process of a live system, "
 "including kernel options, modifications to the bootloader, \"splash\" "
 "screens and startup scripts."
 msgstr ""
diff --git a/manual/pot/other_faq.ssi.pot b/manual/pot/other_faq.ssi.pot
index 683713c..1c5305d 100644
--- a/manual/pot/other_faq.ssi.pot
+++ b/manual/pot/other_faq.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-16 14:45-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,84 +17,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
+#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
+#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
+#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
 #: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
 #: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,28 +102,36 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
+#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
 #: en/user_overview.ssi:108 en/user_overview.ssi:116
 msgid "}code"
 msgstr ""
@@ -466,7 +471,7 @@ msgstr ""
 #. type: Plain text
 #: en/other_faq.ssi:163
 msgid ""
-"Q: How do I add software not in Debian ? A: See Customising package "
+"Q: How do I add software not in Debian ? A: See Customizing package "
 "installation % FIXME: <xref linkend=\"packages\"/>"
 msgstr ""
 
@@ -643,7 +648,7 @@ msgstr ""
 #: en/other_faq.ssi:234
 msgid ""
 "Q: How do I get past boot prompt without a working keyboard? A: See "
-"Customising the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
+"Customizing the bootup process % FIXME: <xref linkend=\"bootup\"/> Note: "
 "Boot from an USB-HDD on an iMac with GRUB did not work."
 msgstr ""
 
diff --git a/manual/pot/other_reporting-bugs.ssi.pot b/manual/pot/other_reporting-bugs.ssi.pot
deleted file mode 100644
index a441fd8..0000000
--- a/manual/pot/other_reporting-bugs.ssi.pot
+++ /dev/null
@@ -1,369 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
-"Language-Team: LANGUAGE <LL at li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:2
-msgid "B~ Reporting bugs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:4
-msgid "1~ Reporting bugs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:6
-msgid ""
-"Debian Live is far from being perfect, but we want to make it as close as "
-"possible to perfect - with your help. Do not hesitate to report a bug: it is "
-"better to fill a report twice than never. However, this chapter includes "
-"recommendations how to file good bug reports."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:8
-msgid "For the impatient:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:10
-msgid ""
-"_* Always check first the image status updates on our homepage at http://"
-"live.debian.net/ for known issues."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:12
-msgid ""
-"_* Always try to reproduce the bug with the *{most recent version}* of live-"
-"helper and live-initramfs before submitting a bug report."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:14
-msgid ""
-"_* Try to give *{as specific information as possible}* about the bug. This "
-"includes (at least) the version of live-helper and live-initramfs used and "
-"the distribution of the live system you are building."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:16
-msgid "2~ Known issues"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:18
-msgid ""
-"Due to the nature of Debian testing and Debian unstable branches being a "
-"moving target, building a live system may not always be possible."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:20
-msgid ""
-"If this is a problem, do not build a system based on testing or unstable, "
-"but go with stable. live-helper does always default to the current stable "
-"release."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:22
-msgid ""
-"Currently known issues are listed under the section 'status' on our homepage "
-"at http://live.debian.net/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:24
-msgid ""
-"It is out of the scope of this manual to train you in correctly identifying "
-"and fixing problems in packages of the development branches, however, there "
-"are two things you can always try: When not succeeding to build testing, try "
-"if unstable works. If unstable does not work either, revert to testing and "
-"pinning the newer version of the failing package from unstable."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:26
-msgid "2~ Rebuild from scratch"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:28
-msgid ""
-"To ensure that a particular bug is not caused by an unclean built system, "
-"please always rebuild the whole live system from scratch to see if the bug "
-"is reproducible."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:30
-msgid "2~ Use up-to-date packages"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:32
-msgid ""
-"Using outdated packages can cause significant problems when trying to "
-"reproduce (and ultimately fix) your problem. If a relevant package is not "
-"available in Debian anymore, please recognize that the resources of the "
-"Debian kernel team are limited and will be unlikely to be able to fix the "
-"problem."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:34
-msgid "2~ Collect information"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:36
-msgid ""
-"Please provide enough information with your report. At a minimum, it should "
-"contain the exact version of live-helper version where the bug is "
-"encountered, and steps to reproduce it. Please use common sense and include "
-"other relevant information if you think that it might help in solving the "
-"problem."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:38
-msgid ""
-"To make the most out of your bug report, we require at least the following "
-"information:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:40
-msgid "_* Architecture of the host system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:42
-msgid "_* Version of live-helper on the host system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:44
-msgid "_* Version of live-initramfs on the live system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:46
-msgid "_* Version of debootstrap and/or cdebootstrap on the host system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:48
-msgid "_* Architecture of the live system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:50
-msgid "_* Distribution of the live system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:52
-msgid "_* Version of the kernel on the live system"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:54
-msgid "You can generate a log of the build process by using the tee command:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:60
-msgid "% code{ % % lh_build 2>&1 | tee buildlog.txt % % }code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:62
-msgid ""
-"Additionally, to rule out other errors, it is always a good idea to tar up "
-"your config directory and upload it somewhere (do *{not}* send it as an "
-"attachment to the mailinglist), so that we can try to reproduce the errors "
-"you encountered."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:64
-msgid ""
-"Remember to send in any logs that were produced with English locale "
-"settings, e.g. run your live-helper commands with a leading #{LC_ALL=C}# or #"
-"{LC_ALL=en_US}#."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:66
-msgid "2~ Use the correct package to report the bug against"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:68
-msgid "Where does the bug appear?"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:70
-msgid "3~ At build time whilst bootstrapping"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:72
-msgid ""
-"live-helper first bootstraps a basic Debian system with #{debootstrap}# or #"
-"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
-"distribution it is bootstrapping, it may fail. If a bug appears here, check "
-"if the error is related to a specific Debian package (most likely), or if it "
-"is related to cdebootstrap itself."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:74
-msgid ""
-"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
-"which we can not fix this directly. Please report such a bug against #"
-"{debootstrap}#, #{cdebootstrap}# or the failing package."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:76
-msgid "3~ At build time whilst installing packages"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:78
-msgid ""
-"live-helper installs additional packages from the Debian archive and "
-"depending on the Debian distribution used and the daily archive state, it "
-"can fail. If a bug appears here, check if the error is also reproducible on "
-"a normal system."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:80
-msgid ""
-"If this is the case, this is not a bug in Debian Live, but rather in Debian "
-"- please report it against the failing package. Running debootstrap "
-"seperately from the Live system build or running lh_bootstrap with #{--debug}"
-"# will give you more information."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:82
-msgid ""
-"Also, if you are using a local mirror and/or any of sort of proxy and you "
-"are experiencing a problem, please always reproduce it first by "
-"bootstrapping from an official mirror."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:84
-msgid "3~ At boot-time"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:87
-msgid ""
-"If your image does not boot, please report it to the mailing list together "
-"with the information requested in collect-information. Do not forget to "
-"mention, how/when the image failed, in Qemu, VMWare or real hardware. If you "
-"are using a virtualization technology of any kind, please always run it on "
-"real hardware before reporting a bug. Providing a screenshot of the failure "
-"is also very helpful.  % FIXME: <xref linkend=\"collect-information\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:89
-msgid "3~ At run-time"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:91
-msgid ""
-"If a package was successfully installed, but fails while actually running "
-"the Live system, this is probably a bug in Debian Live. However,"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:93
-msgid "2~ Do the research"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:95
-msgid ""
-"Before filing the bug, please search the web for the particular error "
-"message or symptom you are getting. As it is highly unlikely that you are "
-"the only person experiencing a particular problem, there is always a chance "
-"that it has been discussed elsewhere, and a possible solution, patch, or "
-"workaround has been proposed."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:97
-msgid ""
-"You should pay particular attention to the Debian Live mailing list, as well "
-"as the homepage, as these are likely to contain the most up-to-date "
-"information. If such information exists, always include the references to it "
-"in your bug report."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:99
-msgid ""
-"In addition, you should check the current bug list for live-helper and the "
-"current bug list for live-initramfs at to see whether something similar has "
-"been reported already."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:101
-msgid "2~ Where to report bugs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:103
-msgid ""
-"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
-"System (BTS). For information on how to use the system, please see http://"
-"bugs.debian.org/. You can also submit the bugs by using the #{reportbug}# "
-"command from the package with the same name."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:105
-msgid ""
-"In general, you should report build time errors against the live-helper "
-"package and run time errors against live-initramfs. If you are unsure of "
-"which package is appropriate or need more help before submitting a bug "
-"report, please send a message to the mailing list and we will help you to "
-"figure it out."
-msgstr ""
-
-#. type: Plain text
-#: en/other_reporting-bugs.ssi:106
-msgid ""
-"Please note that bugs found in distributions derived from Debian (such as "
-"Ubuntu, Knoppix, Xandros, etc.) should *{not}* be reported to the Debian BTS "
-"unless they can be also reproduced on a Debian system using official Debian "
-"packages."
-msgstr ""
diff --git a/manual/pot/project_bugs.ssi.pot b/manual/pot/project_bugs.ssi.pot
new file mode 100644
index 0000000..db499d7
--- /dev/null
+++ b/manual/pot/project_bugs.ssi.pot
@@ -0,0 +1,491 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/project_bugs.ssi:58 en/user_basics.ssi:34 en/user_basics.ssi:44
+#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
+#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
+#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
+#: en/user_basics.ssi:224 en/user_basics.ssi:257 en/user_basics.ssi:273
+#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:38
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
+#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
+#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
+#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
+#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
+#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:2
+msgid "B~ Reporting bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:4
+msgid "1~bugs Reporting bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:6
+msgid ""
+"Debian Live is far from being perfect, but we want to make it as close as "
+"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"better to fill a report twice than never. However, this chapter includes "
+"recommendations how to file good bug reports."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:8
+msgid "For the impatient:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:10
+msgid ""
+"_* Always check first the image status updates on our homepage at http://"
+"live.debian.net/ for known issues."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:12
+msgid ""
+"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
+"build, live-boot, and live-config before submitting a bug report."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:14
+msgid ""
+"_* Try to give *{as specific information as possible}* about the bug. This "
+"includes (at least) the version of live-build, live-boot, and live-config "
+"used and the distribution of the live system you are building."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:16
+msgid "2~ Known issues"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:18
+msgid ""
+"Due to the nature of Debian testing and Debian unstable distributions being "
+"a moving target, building a live system may not always be possible."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:20
+msgid ""
+"If this is a problem, do not build a system based on testing or unstable, "
+"but go with stable. live-build does always default to the current stable "
+"release."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:22
+msgid ""
+"Currently known issues are listed under the section 'status' on our homepage "
+"at http://live.debian.net/"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:24
+msgid ""
+"It is out of the scope of this manual to train you in correctly identifying "
+"and fixing problems in packages of the development distributions, however, "
+"there are two things you can always try: When not succeeding to build "
+"testing, try if unstable works. If unstable does not work either, revert to "
+"testing and pinning the newer version of the failing package from unstable."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:26
+msgid "2~ Rebuild from scratch"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:28
+msgid ""
+"To ensure that a particular bug is not caused by an unclean built system, "
+"please always rebuild the whole live system from scratch to see if the bug "
+"is reproducible."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:30
+msgid "2~ Use up-to-date packages"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:32
+msgid ""
+"Using outdated packages can cause significant problems when trying to "
+"reproduce (and ultimately fix) your problem."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:34
+msgid "2~collect-information Collect information"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:36
+msgid ""
+"Please provide enough information with your report. At a minimum, it should "
+"contain the exact version of live-build version where the bug is "
+"encountered, and steps to reproduce it. Please use common sense and include "
+"other relevant information if you think that it might help in solving the "
+"problem."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:38
+msgid ""
+"To make the most out of your bug report, we require at least the following "
+"information:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:40
+msgid "_* Architecture of the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:42
+msgid "_* Version of live-build on the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:44
+msgid "_* Version of live-boot on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:46
+msgid "_* Version of live-config on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:48
+msgid "_* Version of debootstrap and/or cdebootstrap on the host system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:50
+msgid "_* Architecture of the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
+msgid "_* Distribution of the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:54
+msgid "_* Version of the kernel on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:56
+msgid "You can generate a log of the build process by using the tee command:"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:60
+msgid "lb build 2>&1 | tee build.log"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:64
+msgid ""
+"Additionally, to rule out other errors, it is always a good idea to tar up "
+"your config directory and upload it somewhere (do *{not}* send it as an "
+"attachment to the mailinglist), so that we can try to reproduce the errors "
+"you encountered."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:66
+msgid ""
+"Remember to send in any logs that were produced with English locale "
+"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
+"{LC_ALL=en_US}#."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:68
+msgid "2~ Use the correct package to report the bug against"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:70
+msgid "Where does the bug appear?"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:72
+msgid "3~ At build time whilst bootstrapping"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:74
+msgid ""
+"live-build first bootstraps a basic Debian system with #{debootstrap}# or #"
+"{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
+"distribution it is bootstrapping, it may fail. If a bug appears here, check "
+"if the error is related to a specific Debian package (most likely), or if it "
+"is related to bootstrapping tool itself."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:76
+msgid ""
+"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
+"which we can not fix this directly. Please report such a bug against the "
+"bootstrapping tool or the failing package."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:78
+msgid "3~ At build time whilst installing packages"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:80
+msgid ""
+"live-build installs additional packages from the Debian archive and "
+"depending on the Debian distribution used and the daily archive state, it "
+"can fail. If a bug appears here, check if the error is also reproducible on "
+"a normal system."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:82
+msgid ""
+"If this is the case, this is not a bug in Debian Live, but rather in Debian "
+"- please report it against the failing package. Running debootstrap "
+"seperately from the Live system build or running lb bootstrap with #{--debug}"
+"# will give you more information."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
+msgid ""
+"Also, if you are using a local mirror and/or any of sort of proxy and you "
+"are experiencing a problem, please always reproduce it first by "
+"bootstrapping from an official mirror."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:86
+msgid "3~ At boot-time"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:88
+msgid ""
+"If your image does not boot, please report it to the mailing list together "
+"with the information requested in {Collect information}#collect-information. "
+"Do not forget to mention, how/when the image failed, in Qemu, VMWare or real "
+"hardware. If you are using a virtualization technology of any kind, please "
+"always run it on real hardware before reporting a bug. Providing a "
+"screenshot of the failure is also very helpful."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:90
+msgid "3~ At run-time"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:92
+msgid ""
+"If a package was successfully installed, but fails while actually running "
+"the Live system, this is probably a bug in Debian Live. However,"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:94
+msgid "2~ Do the research"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:96
+msgid ""
+"Before filing the bug, please search the web for the particular error "
+"message or symptom you are getting. As it is highly unlikely that you are "
+"the only person experiencing a particular problem, there is always a chance "
+"that it has been discussed elsewhere, and a possible solution, patch, or "
+"workaround has been proposed."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:98
+msgid ""
+"You should pay particular attention to the Debian Live mailing list, as well "
+"as the homepage, as these are likely to contain the most up-to-date "
+"information. If such information exists, always include the references to it "
+"in your bug report."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:100
+msgid ""
+"In addition, you should check the current bug lists for live-build, live-"
+"boot, and live-config to see whether something similar has been reported "
+"already."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:102
+msgid "2~ Where to report bugs"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:104
+msgid ""
+"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
+"System (BTS). For information on how to use the system, please see http://"
+"bugs.debian.org/. You can also submit the bugs by using the #{reportbug}# "
+"command from the package with the same name."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:106
+msgid ""
+"In general, you should report build time errors against the live-build "
+"package, boot time errors against live-boot, and run time errors against "
+"live-config. If you are unsure of which package is appropriate or need more "
+"help before submitting a bug report, please send a message to the mailing "
+"list and we will help you to figure it out."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:107
+msgid ""
+"Please note that bugs found in distributions derived from Debian (such as "
+"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
+"can be also reproduced on a Debian system using official Debian packages."
+msgstr ""
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index a6e8e15..580b48f 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,30 +101,38 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
@@ -159,17 +164,11 @@ msgid ""
 "A live system usually means an operating system booted on a computer from a "
 "removable medium (such as CD-ROM, USB stick, or network), ready to use "
 "without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see terms)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
+"done at runtime (see {Terms}#terms )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:14
+#: en/user_basics.ssi:12
 msgid ""
 "With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
 "the supported architectures (currently amd64, i386, powerpc and sparc). It "
@@ -177,17 +176,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:16
+#: en/user_basics.ssi:14
 msgid "_* Linux kernel"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:18
+#: en/user_basics.ssi:16
 msgid "_* The Linux image, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
 msgid ""
 "_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
 "containing modules possibly needed to mount the filesystem's image and some "
@@ -195,10 +194,10 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
 msgid ""
-"_* *{System image}*: The operating systems filesystem image. Debian Live "
-"uses SquashFS, a compressed filesystem, to minimize its image size. Note "
+"_* *{System image}*: The operating systems filesystem image. The SquashFS "
+"compressed filesystem is used to minimize the Debian Live image size. Note "
 "that it's read-only. So, during boot the Debian Live system will use a RAM "
 "disk and 'union' mechanism to enable writing files within the running "
 "system. However, all modifications will be lost upon shutdown unless "
@@ -206,12 +205,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
 msgid "% FIXME: <xref linkend=\"persistence\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
 msgid ""
 "_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -225,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
 msgid ""
 "_* live-build will build the system image from your specifications, setup a "
 "Linux kernel and its initrd, a bootloader to run them, all in one media-"
@@ -233,12 +232,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
 msgid ""
 "The following sequence of commands, provided by live-build, will create a "
 "basic ISO image containing just the Debian standard system without X.org. It "
@@ -246,129 +245,135 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
 msgid ""
 "First, we run the #{lb config}# command which will create a \"config/\" "
 "hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
 msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
 msgid ""
 "By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see lb-config)."
+"the defaults (see {The lb config command}#lb-config )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:46
+#: en/user_basics.ssi:42
 msgid ""
 "Now that we have a \"config/\" hierarchy, we may build the image with the lb "
 "build command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:50 en/user_basics.ssi:122 en/user_basics.ssi:204
+#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
 msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:50
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see lb-build)."
+"connection (see {The lb build command}#lb-build )."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:52
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:54
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:64 en/user_basics.ssi:144
+#: en/user_basics.ssi:58 en/user_basics.ssi:146
 msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:60
 msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:64
 msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:66
 msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:70
 msgid "# apt-get install virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:74
 msgid ""
 "and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
 "build the required kernel modules to run virtualbox-ose."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:82
+#: en/user_basics.ssi:76
 msgid ""
 "After successful installation, virtualbox can be e.g. found in the GNOME "
 "menu under 'Applications/System Tools/VirtualBox OSE'."
 msgstr ""
 
 #. type: Plain text
+#: en/user_basics.ssi:78
+msgid ""
+"Please consider including of following packages onto the live image to "
+"achieve higher resolution of the display when booting the live image in "
+"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
+"default resolution of the virtualbox-ose display shouldn't work with the gui-"
+"installer)."
+msgstr ""
+
+#. type: Plain text
 #: en/user_basics.ssi:84
+msgid ""
+"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:88
 msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:86
+#: en/user_basics.ssi:90
 msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:94
 msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:92
+#: en/user_basics.ssi:96
 msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:100
 msgid "2~ Building an USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:98
+#: en/user_basics.ssi:102
 msgid ""
 "The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
@@ -377,46 +382,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:104
 msgid ""
 "Note if you created an iso image with the previous example, you will need to "
-"clean up your working directory with the #{lb clean} command (see lb-clean):"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:102
-msgid "% FIXME: <xref linkend=\"lb-clean\"/>"
+"clean up your working directory with the #{lb clean} command (see {The lb "
+"clean command}#lb-clean ):"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:106 en/user_basics.ssi:186
+#: en/user_basics.ssi:108 en/user_basics.ssi:188
 msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:112
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:114
+#: en/user_basics.ssi:116
 msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:118
+#: en/user_basics.ssi:120
 msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:126
+#: en/user_basics.ssi:128
 msgid "3~ Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:130
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on an USB stick. Plug in an USB "
@@ -424,12 +425,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:132
+#: en/user_basics.ssi:134
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:138
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -437,28 +438,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:140
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:142
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:148
 msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:154
 msgid ""
 "If you want to use the remaining free space after you have installed the "
 "binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -467,45 +468,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:158
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:162
 msgid ""
 "Ater the creation of the partition you have to create a filsystem on it. One "
 "possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:164
+#: en/user_basics.ssi:166
 msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:168
+#: en/user_basics.ssi:170
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:172
+#: en/user_basics.ssi:174
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:176
+#: en/user_basics.ssi:178
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
 msgid ""
 "The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
@@ -513,28 +514,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:184
 msgid ""
 "Note if you performed any previous examples, you will need to clean up your "
 "working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:192
 msgid ""
 "Run the #{lb config}# command with the parameters to configure the \"config/"
 "\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:194
+#: en/user_basics.ssi:196
 msgid ""
 "$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
 msgid ""
 "In contrast with the ISO and USB hdd images, netbooting does not support "
 "serving a filesystem image with the client so the files must be served via "
@@ -544,12 +545,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:202
 msgid "Now build the image with the #{lb build}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
 msgid ""
 "In a network boot the client runs a small piece of software, which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -560,7 +561,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
@@ -569,17 +570,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
 msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the computer netbooting, and to advertise the location of the PXE "
@@ -587,25 +588,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:220
 msgid ""
 "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
 "dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:226
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:229
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -613,7 +614,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:230
+#: en/user_basics.ssi:232
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -621,7 +622,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:235
+#: en/user_basics.ssi:237
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -631,7 +632,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:239
+#: en/user_basics.ssi:241
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client:\n"
@@ -640,7 +641,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:242
+#: en/user_basics.ssi:244
 #, no-wrap
 msgid ""
 "    # PXE boot loader (first program to be loaded, by TFTP)\n"
@@ -648,7 +649,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:247
 #, no-wrap
 msgid ""
 "  }\n"
@@ -656,17 +657,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
 msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
 msgid "This serves the kernel and initial ramdisk to the system at run-time."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:253
+#: en/user_basics.ssi:255
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
 "inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -674,27 +675,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:257
-msgid "dpkg-reconfigure -plow tftpd-hpa"
-msgstr ""
-
-#. type: Plain text
 #: en/user_basics.ssi:259
-msgid "code}"
+msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
 msgid "and fill in the new tftp server directory when being asked about it."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -702,35 +698,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
 msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:271
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:275
 msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:279
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:283
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -739,40 +735,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:291
 msgid ""
 "Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
 msgid "3~ Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
 msgid "_* Install qemu, bridge-utils, sudo."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:299
 msgid "Edit /etc/qemu-ifup:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:308
+#: en/user_basics.ssi:310
 msgid ""
 "#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
 "\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -781,62 +777,62 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
 msgid "Get, or build a grub-floppy-netboot (in the svn)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
 msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:324
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:332
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:336
+#: en/user_basics.ssi:338
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:341
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:342
+#: en/user_basics.ssi:344
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:347
+#: en/user_basics.ssi:349
 msgid ""
 "ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
 "83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -844,19 +840,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:355
 msgid ""
 "_* Double click on this file (or run VMWare player and selecet this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:354
+#: en/user_basics.ssi:356
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index f9c43bd..c4275ac 100644
--- a/manual/pot/user_customization-contents.ssi.pot
+++ b/manual/pot/user_customization-contents.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,52 +101,54 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:2
-msgid "B~ Customising contents"
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid "B~ Customizing contents"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:4
-msgid "1~ Customising contents"
+msgid "1~customizing-contents Customizing contents"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-contents.ssi:6
-msgid "This chapter discusses further customisation of the live system."
+msgid "This chapter discusses further customization of the live system."
 msgstr ""
 
 #. type: Plain text
@@ -210,6 +209,11 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+#: en/user_customization-contents.ssi:26
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
 #: en/user_customization-contents.ssi:28
 msgid "3~ Live/chroot local includes"
 msgstr ""
diff --git a/manual/pot/user_customization-internationalization.ssi.pot b/manual/pot/user_customization-internationalization.ssi.pot
new file mode 100644
index 0000000..4f993b4
--- /dev/null
+++ b/manual/pot/user_customization-internationalization.ssi.pot
@@ -0,0 +1,218 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:2
+msgid "B~ Customizing locale and language"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:4
+msgid "1~customizing-locale-and-language Customizing locale and language"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:6
+msgid "2~ Default locale and keyboard"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:8
+msgid ""
+"The default locale when building a live cd is \"locales=en_US.UTF-8\", to "
+"set the locale for e.g. Switzerland, you can use \"locales=de_CH.UTF-8\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:12
+msgid "$ lb config --bootappend-live \"locales=de_CH.UTF-8\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:16
+msgid "The entry for a Swiss-German keyboard would be:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:20
+msgid "$ lb config --bootappend-live \"keyboard-layouts=ch\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:24
+msgid "Combined, the keyboard and locale configured for Switzerland would be:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:28
+msgid ""
+"$ lb config --bootappend-live =\"locales=de_CH.UTF-8 keyboard-layouts=ch\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:32
+msgid ""
+"Note: You can find a list of options in the manpage for live-config. "
+"Currently, only UTF-8 locales are supported."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:34
+msgid "2~ l10n Packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:36
+msgid ""
+"An experimental feature of live-build is to automatically check for each "
+"package for which it is know that there are -l10n packages available and "
+"install them. To add German packages the entry would be"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:40
+msgid "$ lb config --language \"de\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-internationalization.ssi:43
+msgid ""
+"This will also change the default syslinux language if translations are "
+"available or local translations have been put into #{config/templates/"
+"syslinux/de}#."
+msgstr ""
diff --git a/manual/pot/user_customization-overview.ssi.pot b/manual/pot/user_customization-overview.ssi.pot
new file mode 100644
index 0000000..c8f4007
--- /dev/null
+++ b/manual/pot/user_customization-overview.ssi.pot
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-22 08:57-0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
+msgid "B~ Customizing contents"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:4
+msgid "1~customization-overview Customization overview"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:7
+msgid ""
+"% FIXME: just a stub for now.  In conversational style, cover the different "
+"kinds of customization % and link to each section within the text."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-overview.ssi:9
+msgid ""
+"This chapter gives an overview of the various ways in which your Debian live "
+"systems may be customized. See sections {Customizing package installation}"
+"#customizing-package-installation, {Customizing contents}#customizing-"
+"contents and {Customizing locale and language}#customizing-locale-and-"
+"language."
+msgstr ""
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index d90eb4a..57cdfdb 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 08:58-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,45 +102,53 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:220 en/user_customization-packages.ssi:147
+#: en/user_basics.ssi:230 en/user_customization-packages.ssi:153
 msgid "% FIXME"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:2
-msgid ":B~ Customising package installation"
+msgid ":B~ Customizing package installation"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:4
-msgid "1~ Customising package installation"
+msgid "1~customizing-package-installation Customizing package installation"
 msgstr ""
 
 #. type: Plain text
@@ -461,16 +466,39 @@ msgstr ""
 #. type: Plain text
 #: en/user_customization-packages.ssi:145
 #, no-wrap
+msgid "*{Local binary packages lists}*\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:147
+msgid ""
+"In case you want to include some required .deb packages to live media's "
+"pool/ (without installing them onto the live image) you may need to use "
+"lists using binary local package lists stored in #{config/binary_local-"
+"packageslists}#. Such media can be used as a customized debian install image "
+"for offline installations."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:149
+msgid ""
+"Package lists that exist in this directory need to have a .list suffix in "
+"order to be processed."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:151
+#, no-wrap
 msgid "*{Extending a provided package list using includes}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:160
 msgid "% code{ % % #include <gnome> % iceweasel % % }code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:162
 msgid ""
 "The package lists that are included with live-build make extensive use of "
 "includes. They are available to view in the #{/usr/share/live/build/lists}# "
@@ -478,75 +506,75 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:164
 #, no-wrap
 msgid "*{Using conditionals inside packages lists}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:170
 msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:174
 msgid "or if #{LB_ARCHITECTURE}# is set to #{i386}# or #{amd64}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:180
 msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:184
 msgid "or if #{LB_ARCHIVE_AREAS}# contains either #{contrib}# or #{non-free}#:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:190
 msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:188
+#: en/user_customization-packages.ssi:194
 msgid "A conditional may surround an #{#include}# directive:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:194
+#: en/user_customization-packages.ssi:200
 msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:198
+#: en/user_customization-packages.ssi:204
 msgid ""
 "Any live-build configuration variable that begins with #{LB_}# can be tested "
 "in this way."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:200
+#: en/user_customization-packages.ssi:206
 msgid "The nesting of conditionals is not supported."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:202
+#: en/user_customization-packages.ssi:208
 msgid "3~ Tasks"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:204
+#: en/user_customization-packages.ssi:210
 msgid "%FIXME"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:206
+#: en/user_customization-packages.ssi:212
 msgid "2~ Installing modified or third-party packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:208
+#: en/user_customization-packages.ssi:214
 msgid ""
 "Whilst it is against the philosophy of Debian Live, it may sometimes be "
 "necessary to build a Live system with modified versions of packages that are "
@@ -557,7 +585,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:210
+#: en/user_customization-packages.ssi:216
 msgid ""
 "This section does not cover advice regarding building or maintaining "
 "modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -568,35 +596,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:212
+#: en/user_customization-packages.ssi:218
 msgid "There are two ways of installing modified custom packages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:214
+#: en/user_customization-packages.ssi:220
 msgid "_* #{chroot_local-packages}#"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:222
 msgid "_* Using a custom APT repository"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:224
 msgid ""
 "The #{chroot_local-packages}# is simpler to achieve and useful for \"one-off"
-"\" customisations but has a number of drawbacks, whilst using a custom APT "
+"\" customizations but has a number of drawbacks, whilst using a custom APT "
 "repository is more time-consuming to set up."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:226
 msgid "3~ Using #{chroot_local-packages}# to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:228
 msgid ""
 "To install a custom package, simply copy it to the #{config/chroot_local-"
 "packages}# directory. Packages that are inside this directory will be "
@@ -605,45 +633,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:230
 msgid ""
 "Packages *{must}* be named in the prescribed way. One simple way to do this "
 "is to use #{dpkg-name}#."
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:232
 msgid ""
 "Using #{chroot_local-packages}# for installation of custom packages has "
 "disadvantages:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:234
 msgid "_* It is not possible to use secure APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:236
 msgid ""
 "_* You must install all appropriate packages in the #{config/chroot_local-"
 "packages}# directory"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:238
 msgid ""
 "_* It does not lend itself to storing Debian Live configurations in revision "
 "control"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:240
 msgid "3~ Using an APT repository to install custom packages"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:242
 msgid ""
 "Unlike using #{chroot_local-packages}#, when using a custom APT repository "
 "you must ensure that you specify the packages elsewhere. See lb-packages for "
@@ -651,12 +679,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:244
 msgid "% FIXME: <xref linkend=\"lb-packages\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:246
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
@@ -664,12 +692,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:248
 msgid "3~ Custom packages and APT"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:250
 msgid ""
 "live-build uses APT to install all packages into the live system so will "
 "therefore inherit behaviours from this program. One relevant example is that "
@@ -679,7 +707,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:252
 msgid ""
 "Because of this, you may wish to increment the version number in your custom "
 "packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -689,17 +717,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:254
 msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:256
 msgid "3~ Altering APT preferences during Live system"
 msgstr ""
 
 #. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:257
 msgid ""
 "Whilst it may seem unnecessary effort to create an APT repository to install "
 "custom packages, the infrastructure can be easily re-used at a later date to "
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index 036cdbe..e10ea02 100644
--- a/manual/pot/user_installation.ssi.pot
+++ b/manual/pot/user_installation.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-23 16:43+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -104,46 +101,42 @@ msgstr ""
 #: en/other_procedures.ssi:54 en/other_procedures.ssi:131
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/other_customization-internationalization.ssi:32
-#: en/user_installation.ssi:44
-msgid "or"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:101
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
 #: en/user_installation.ssi:2
 msgid ":B~ Installation"
 msgstr ""
@@ -243,6 +236,11 @@ msgid "# apt-get install live-build"
 msgstr ""
 
 #. type: Plain text
+#: en/user_installation.ssi:44
+msgid "or"
+msgstr ""
+
+#. type: Plain text
 #: en/user_installation.ssi:48
 msgid "# aptitude install live-build"
 msgstr ""
@@ -296,17 +294,17 @@ msgid "and uninstall it with:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:87
-msgid "# make uninstall }code"
+#: en/user_installation.ssi:86
+msgid "# make uninstall"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:89
+#: en/user_installation.ssi:90
 msgid "3~ From 'snapshots'"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:91
+#: en/user_installation.ssi:92
 msgid ""
 "If you do not wish to build or install live-build from source, you can use "
 "snapshots. These are built automatically from the latest version in Git and "
@@ -314,45 +312,45 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:93
+#: en/user_installation.ssi:94
 msgid "2~ live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:95
+#: en/user_installation.ssi:96
 #, no-wrap
-msgid "*{Note:}* You do not need to install live-boot on your system to create customised Debian Live systems. However, doing so will do no harm.\n"
+msgid "*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:97
-msgid "3~ Using a customised live-boot"
+#: en/user_installation.ssi:98
+msgid "3~ Using a customized live-boot"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:99
+#: en/user_installation.ssi:100
 msgid ""
 "To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in terms."
+"familiar with the terms mentioned in {Terms}#terms ."
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:103
+#: en/user_installation.ssi:102
 msgid "_* Checkout the live-boot source"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:107
+#: en/user_installation.ssi:106
 msgid "$ git clone git://live.debian.net/git/live-boot.git"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:111
+#: en/user_installation.ssi:110
 msgid "_* Make changes to your local copy"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:113
+#: en/user_installation.ssi:112
 msgid ""
 "And beware that if you want to add your pre-init script in live-bottom, you "
 "should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -360,33 +358,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:115
+#: en/user_installation.ssi:114
 msgid "_* Build a live-boot .deb"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:117
+#: en/user_installation.ssi:116
 msgid ""
 "You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is squeeze then you should "
-"build against squeeze. You can use a personal builder such as /{pbuilder}/ "
+"your target platform: this means if your target is Squeeze then you should "
+"build against Squeeze. You can use a personal builder such as /{pbuilder}/ "
 "or /{sbuild}/ to automate building packages in chroot. To build directly on "
 "the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ "
 "package):"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:122
+#: en/user_installation.ssi:121
 msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:126
+#: en/user_installation.ssi:125
 msgid "_* Use the generated live-boot .deb"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:128
+#: en/user_installation.ssi:127
 msgid ""
 "As live-boot is installed by live-build system, installing the package in "
 "the host system is not sufficient: you should treat the generated .deb like "
@@ -395,19 +393,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:130
+#: en/user_installation.ssi:129
 msgid ""
 "% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
 "apt\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:132
+#: en/user_installation.ssi:131
 msgid "3~ Using live-boot snapshots"
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:134
+#: en/user_installation.ssi:133
 msgid ""
 "You can let live-build automatically use the latest snapshot of live-boot by "
 "configuring a third-party repository in your live-build configuration "
@@ -416,6 +414,6 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_installation.ssi:138
+#: en/user_installation.ssi:137
 msgid "lb config --repository live.debian.net"
 msgstr ""
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
new file mode 100644
index 0000000..228a192
--- /dev/null
+++ b/manual/pot/user_managing_a_configuration.ssi.pot
@@ -0,0 +1,268 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-10-13 17:00+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
+#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:88 en/user_basics.ssi:104 en/user_basics.ssi:112
+#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:184 en/user_basics.ssi:192 en/user_basics.ssi:202
+#: en/user_basics.ssi:222 en/user_basics.ssi:255 en/user_basics.ssi:271
+#: en/user_basics.ssi:279 en/user_basics.ssi:299 en/user_basics.ssi:324
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
+#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:105
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:60
+#: en/user_overview.ssi:104 en/user_overview.ssi:112
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
+#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
+#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
+#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
+#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
+#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
+#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
+#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
+#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
+#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
+#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
+#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
+#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:109 en/user_installation.ssi:124
+#: en/user_installation.ssi:139 en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:98
+#: en/user_overview.ssi:108 en/user_overview.ssi:116
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:2
+msgid ":B~ Managing a configuration"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:4
+msgid "1~ Managing a configuration"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:6
+msgid ""
+"This chapter explains how to manage a live configuration from initial "
+"creation, through successive revisions and successive releases of both the "
+"live-build software and the live image itself."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:8
+msgid "2~ Use auto to manage configuration changes"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:10
+msgid ""
+"Live configurations rarely are perfect on the first try. You'll likely need "
+"to make a series of revisions until you are satisfied. However, "
+"inconsistencies can creep into your configuration from one revision to the "
+"next if you aren't careful. The main problem is, once a variable is given a "
+"default value, that value will not be recomputed from other variables that "
+"may change in later revisions."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:12
+msgid ""
+"For example, when the distribution is first set, many 'dependent' variables "
+"are given default values that suit that distribution. However, if you later "
+"decide to change the distribution, those dependent variables continue to "
+"retain old values that are no longer appropriate."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:14
+msgid ""
+"A second, related problem is that if you run #{lb config}# and then upgrade "
+"to a new version of live-build that has changed one of the variable names, "
+"you will discover this only by manual review of the variables in your config "
+"files, which you will then need to use to set the appropriate option again."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:16
+msgid ""
+"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
+"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
+"that are designed to help you manage your configuration. Simply create an "
+"auto/config script containing #{lb config}# command with all desired "
+"options, and an auto/clean that removes the files containing configuration "
+"variable values, and each time you #{lb config}# and #{lb clean}#, these "
+"files will be executed. This will ensure that your configuration is kept "
+"internally consistent from one revision to the next and from one live-build "
+"release to the next (though you will still have to take care and read the "
+"documentation when you upgrade live-build and make adjustments as needed)."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:18
+msgid "2~ Example auto scripts"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:20
+msgid ""
+"Use the following auto script examples as the starting point for your new "
+"live-build configuration. Take note that when you call the #{lb}# command "
+"that the auto script wraps, you must specify #{noauto}# as its parameter to "
+"ensure that the auto script isn't called again, recursively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:22
+msgid "auto/config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:29
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"lb config noauto \\\n"
+"\t--architecture i386 \\\n"
+"\t${@}\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:33
+msgid "auto/clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:41
+#, no-wrap
+msgid ""
+"#!/bin/sh\n"
+"lb clean noauto ${@}\n"
+"rm -f config/binary config/bootstrap \\\n"
+"\tconfig/chroot config/common config/source\n"
+"rm -f binary.log\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:45
+msgid "auto/build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:50
+msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:54
+msgid ""
+"Edit auto/config, changing or adding any options as you see fit. In the "
+"example above, --architecture is set to i386 so that when the image is built "
+"on an amd64 system, it will not default to building amd64 images. Change "
+"this to an appropriate value for your image (or delete it if you want to use "
+"the default) and add any additional options in continuation lines that "
+"follow."
+msgstr ""
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index b263f9c..cffecd5 100644
--- a/manual/pot/user_overview.ssi.pot
+++ b/manual/pot/user_overview.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-22 07:52-0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
+#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
+#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
 #: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
@@ -26,56 +26,58 @@ msgstr ""
 #: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
 #: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
 #: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
+#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
+#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
+#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
+#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
+#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
+#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
+#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
 #: en/user_customization-packages.ssi:103
 #: en/user_customization-packages.ssi:111
 #: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
 #: en/user_installation.ssi:46 en/user_installation.ssi:56
 #: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:105
-#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_installation.ssi:84 en/user_installation.ssi:106
+#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_managing_a_configuration.ssi:24
+#: en/user_managing_a_configuration.ssi:35
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
 #: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
 #: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
 #: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
@@ -84,17 +86,12 @@ msgstr ""
 #: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
 #: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -105,43 +102,41 @@ msgstr ""
 #: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
 #: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
 #: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
+#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
+#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
+#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
+#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
+#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
+#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
 #: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
 #: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
 #: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
 #: en/user_customization-packages.ssi:107
 #: en/user_customization-packages.ssi:115
 #: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
 #: en/user_installation.ssi:50 en/user_installation.ssi:60
 #: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_installation.ssi:88 en/user_installation.ssi:110
+#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:43
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
-
-#. type: Plain text
 #: en/user_overview.ssi:2
 msgid ":B~ Overview of tools"
 msgstr ""
@@ -154,13 +149,13 @@ msgstr ""
 #. type: Plain text
 #: en/user_overview.ssi:6
 msgid ""
-"This chapter contains an overview of the two main tools used in building "
-"Debian Live systems."
+"This chapter contains an overview of the three main tools used in building "
+"Debian Live systems: live-build, live-boot and live-config."
 msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:8
-msgid "2~ live-build"
+msgid "2~live-build live-build"
 msgstr ""
 
 #. type: Plain text
@@ -209,11 +204,11 @@ msgid ""
 "Unlike debhelper, live-build contains a tool to generate a skeleton "
 "configuration directory, #{lb config}#. This could be considered to be "
 "similar to tools such as #{dh-make}#. For more information about #{lb config}"
-"#, please see lb-config."
+"#, please see {The lb config command}#lb-config."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:24
+#: en/user_overview.ssi:22
 msgid ""
 "Besides the common config/common, which is used by all live-build commands, "
 "some additional files can be used to configure the behavior of specific "
@@ -223,7 +218,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:26
+#: en/user_overview.ssi:24
 msgid ""
 "For example, the #{lb_bootstrap_debootstrap}# command uses files named "
 "config/bootstrap and config/bootstrap_debootstrap to read the options it "
@@ -233,7 +228,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:28
+#: en/user_overview.ssi:26
 msgid ""
 "live-build respects environment variables which are present in the context "
 "of the shell it is running. If variables can be read from config files, then "
@@ -244,7 +239,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:30
+#: en/user_overview.ssi:28
 msgid ""
 "All config files are shell scripts which are sourced by a live-build "
 "command. That means they have to follow the normal shell syntax. You can "
@@ -252,7 +247,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:32
+#: en/user_overview.ssi:30
 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."
@@ -264,87 +259,68 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:34
-msgid "Please see installation for information on how to install live-build."
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:36
-msgid "% FIXME: <xref linkend=\"installation\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:38
+#: en/user_overview.ssi:32
 msgid ""
 "The remainder of this section discusses the three most important commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:40
+#: en/user_overview.ssi:34
 msgid ""
-"_* *{lb config}*: Responsible for initialising a Live system configuration "
-"directory. See lb-config for more information."
+"_* *{lb config}*: Responsible for initializing a Live system configuration "
+"directory. See {The lb config command}#lb-config for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:44
+#: en/user_overview.ssi:36
 msgid ""
-"_* *{lb build}*: Responsible for starting a Live system build. See lb-build "
-"for more information."
+"_* *{lb build}*: Responsible for starting a Live system build. See {The lb "
+"build command}#lb-build for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:48
+#: en/user_overview.ssi:38
 msgid ""
 "_* *{lb clean}*: Responsible for removing parts of a Live system build. See "
-"lb-clean for more information."
+"{The lb clean command}#lb-clean for more information."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:50
-msgid "% FIXME: <xref linkend=\"lb-clean\"/"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:52
-msgid "3~ The #{lb config}# command"
+#: en/user_overview.ssi:40
+msgid "3~lb-config The #{lb config}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:54
+#: en/user_overview.ssi:42
 msgid ""
-"As discussed in live-build, the scripts that make up live-build source their "
-"configuration from a single directory named config/. As constructing this "
-"directory by hand would be time-consuming and error-prone, the #{lb config}# "
-"command can be used to create skeleton configuration folders."
+"As discussed in {live-build}#live-build, the scripts that make up live-build "
+"source their configuration from a single directory named config/. As "
+"constructing this directory by hand would be time-consuming and error-prone, "
+"the #{lb config}# command can be used to create skeleton configuration "
+"folders."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:56
-msgid "% FIXME: <xref linkend=\"live-build\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:58
+#: en/user_overview.ssi:44
 msgid ""
 "Issuing #{lb config}# without any arguments creates a config subdirectory "
 "which it populates with some default settings:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:63
+#: en/user_overview.ssi:49
 msgid "$ lb config P: Creating config tree"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:68
+#: en/user_overview.ssi:54
 msgid ""
 "$ ls -l total 8 drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto drwxr-xr-x 22 "
 "user user 4096 Sep 7 13:02 config"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:82
 msgid ""
 "$ ls -l config/ total 104 -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary "
 "drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer drwxr-xr-x 2 "
@@ -369,7 +345,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:86
 msgid ""
 "Using #{lb config}# without any arguments would be suitable for users who "
 "are either happy editing the generated files, or are simply happy with the "
@@ -377,7 +353,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:88
 msgid ""
 "You can ask #{lb config}# to generate a config/ directory \"preseeded\" with "
 "various options. This might be suitable if you do not require the default "
@@ -385,38 +361,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:92
 msgid "$ lb config -p gnome"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:96
 msgid ""
 "will build a config/ directory configured to include the 'gnome' package "
 "list. It is possible to specify many options:"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:114
+#: en/user_overview.ssi:100
 msgid ""
 "$ lb config --binary-images net --hostname live-machine --username live-"
 "user ..."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:118
+#: en/user_overview.ssi:104
 msgid ""
 "A full list of options is available in the #{lb_config}# man page. Most "
 "options have a parallel with an \"LB_\" prefixed variable."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:120
-msgid "3~ The #{lb build}# command"
+#: en/user_overview.ssi:106
+msgid "3~lb-build The #{lb build}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:122
+#: en/user_overview.ssi:108
 msgid ""
 "The #{lb build}# command reads in your configuration from the config/ "
 "directory. It then runs the lower lower level commands needed to build your "
@@ -424,24 +400,24 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:124
-msgid "3~ The #{lb clean}# command"
+#: en/user_overview.ssi:110
+msgid "3~lb-clean The #{lb clean}# command"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:126
+#: en/user_overview.ssi:112
 msgid ""
 "It is the job of the #{lb clean}# command to remove various parts of a build "
 "so subsequent builds can start from a clean state."
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:128
-msgid "2~ The live-boot package"
+#: en/user_overview.ssi:114
+msgid "2~live-boot The live-boot package"
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:130
+#: en/user_overview.ssi:116
 msgid ""
 "live-boot is a collection of scripts providing hooks for the initramfs-"
 "tools, used to generate an initramfs capable of booting live systems, such "
@@ -450,7 +426,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:132
+#: en/user_overview.ssi:118
 msgid ""
 "At boot time it will look for read-only media containing a \"/live\" "
 "directory where a root filesystem (often a compressed filesystem image like "
@@ -459,9 +435,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/user_overview.ssi:133
+#: en/user_overview.ssi:120
 msgid ""
 "More information on initial ramfs in Debian can be found in the Debian Linux "
 "Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
 "on initramfs."
 msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:122
+msgid "2~live-config The live-config package"
+msgstr ""
+
+#. type: Plain text
+#: en/user_overview.ssi:124
+msgid ""
+"live-config consists of the scripts that run at boot time after live-boot to "
+"configure the live system automatically. It handles such tasks as setting "
+"the hostname, locales and timezone, creating the live user, inhibiting cron "
+"jobs and performing autologin of the live user."
+msgstr ""
diff --git a/manual/de/_sisu/.empty b/manual/pt_BR/_sisu/.empty
similarity index 100%
copy from manual/de/_sisu/.empty
copy to manual/pt_BR/_sisu/.empty
diff --git a/manual/de/_sisu/.empty b/manual/pt_BR/_sisu/image/.empty
similarity index 100%
copy from manual/de/_sisu/.empty
copy to manual/pt_BR/_sisu/image/.empty
diff --git a/manual/de/_sisu/sisurc.yml b/manual/pt_BR/_sisu/sisurc.yml
similarity index 100%
copy from manual/de/_sisu/sisurc.yml
copy to manual/pt_BR/_sisu/sisurc.yml
diff --git a/manual/de/_sisu/skin/doc/skin_debian-live.rb b/manual/pt_BR/_sisu/skin/doc/skin_debian-live.rb
similarity index 100%
copy from manual/de/_sisu/skin/doc/skin_debian-live.rb
copy to manual/pt_BR/_sisu/skin/doc/skin_debian-live.rb
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
new file mode 100644
index 0000000..26c5921
--- /dev/null
+++ b/manual/pt_BR/about_manual.ssi
@@ -0,0 +1,218 @@
+:B~ Sobre esse manual
+
+1~ Sobre esse manual
+
+O principal objetivo deste manual é servir como único ponto de acesso para
+toda a documentação relacionada ao projeto Debian Live. Ele não inclui
+documentação do usuário para usar o sistema Debian Live nem sobre as coisas
+que são Live específicas.
+
+Alguns comandos mencionados no texto devem ser executados com privilégios de
+super-usuário, que podem ser obtidos tornando-se usuário root via #{su}# ou
+usando #{sudo}#. Para distinção entre os comandos que talvez possam ser
+executados como usuário não privilegiado e aqueles que requerem privilégios
+de super usuário, os comandos são precididos por: #{$}# ou #{#}#
+respectivamente. Esse simbolo não é parte do comando.
+
+2~terms Terminologia
+
+_* *{Live system}*: Um sistema operacional que pode inicializar sem
+instalação em um disco rígido. Sistemas live não devem alterar o(s)
+sistema(s) operacional(s) local(is) ou arquivo(s) já instalados no disco
+rígido do computador a não ser que seja instruido para isso. Sistemas Live
+são tipicamente inicializados a partir de uma mídia como CDs, DVDs ou
+pendrive(s). Alguns também podem inicializar através da rede.
+
+_* *{Debian Live}*: O sub-projeto Debian que manten os pacotes live-boot,
+live-build, live-config, e live-manual.
+
+_* *{Debian Live system}*: Um sistema live que usa softwares do sistema
+operacional Debian que também pode ser inicializado a partir de CD's, DVDs,
+Discos USB, através da rede (via imagens netbook), e através da Internet
+(via parametro de boot #{fetch=URL}#).
+
+_* *{Host system}*: O ambiente usado para criar o sistema live.
+
+_* *{Target system}*: O ambiente usado para rodar o sistema live.
+
+_* *{live-boot}*: Uma coleção de scripts usados para inicializar sistemas
+live. live-boot era formalmente parte do live-initramfs.
+
+_* *{live-build}*: Uma coleção de scripts usados para construir sistemas
+Debian live customizados. live-build era formalmente conhecido como
+live-helper, e ainda antes conhecido como live-package.
+
+_* *{live-config}*: Uma coleção de scripts usados para configurar um sistema
+live durante o processo de boot. live-config era formalmente parte do
+live-initramfs.
+
+_* *{live-manual}*: Esse documento é mantido em um pacote chamado
+live-manual.
+
+_* *{Debian Installer (d-i)}*: O sistema oficial de instalação para a
+distribuição Debian.
+
+_* *{Boot parameters}*: Parametros que podem ser entrados no prompt do
+bootloader para influenciar o kernel ou o live-config.
+
+_* *{chroot}*: O programa chroot, chroot(8), nos habilita a rodar
+simultâneamente diferentes instâncias do ambiente do GNU/Linux em um único
+sistema sem reinicialização.
+
+_* *{Binary image}*: Um arquivo contendo o sistema live, como binary.iso ou
+binary.img.
+
+_* *{Target distribution}*: A distribuição em que o sistema live será
+baseado. Isso pode diferir da distribuição do seu sistema host.
+
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: A distribuição
+estável(stable) contem a última versão oficial lançada do Debian. A
+distribuição "Testing"  é a ária de estágio para a próxima versão
+estável(stable). A maior vantagem de usar essa distribuição é que ela tem
+versões mais recentes de software relacionado com a versão
+estável(stable). A distribuição instável(unstable) é onde ocorre o
+desenvolvimento ativo do Debian. Geralmente, essa distribuição é mantida por
+desenvolvedores e aqueles que vivem no limite.
+
+No tempo da escrita, Squeeze é o a atual versão estável(stable) e Wheezy é a
+atual versão testing. Sid sempre será um sinônimo para a versão
+instável(unstable).
+
+2~Autores
+
+A lista de autores (em ordem alfabética)
+
+_* Ben Armstrong
+
+_* Brendan Sleight
+
+_* Chris Lamb
+
+_* Daniel Baumann
+
+_* Franklin Piat
+
+_* Jonas Stein
+
+_* Kai Hendry
+
+_* Marco Amadori
+
+_* Mathieu Geli
+
+_* Matthias Kirschner
+
+_* Richard Nelson
+
+_* Trent W. Buck
+
+2~ Contribuindo com esse documento
+
+This manual is intended as a community project and all proposals for
+improvements and contributions are extremely welcome. The preferred way to
+submit a contribution is to send it to the mailing list. Please see
+{Contact}#contact for more information.
+
+Quando estiver submetendo uma contribuição, por favor identificar claramente
+o seu titular de direitos autorais e incluir a declaração de
+licenciamento. Note que para ser aceita, a contribuição deve ser licenciada
+obre as mesmas licenças do resto do documento, ou seja, GPL versão 3 ou
+superior.
+
+Os fontes para esse manail são mantidos usando o sistema de controle de
+versão Git. Você pode fazer o checkout da ultima cópia executando:
+
+code{
+
+$ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+Antes de submeter sua contribuição, por favor pré-visualize seu
+trabalho. Para pré-visualizar o live-manual, tenha certeza que os pacotes
+necessários para contruir estão instalados executando:
+
+code{
+
+# apt-get install make po4a sisu-complete
+
+}code
+
+Você também pode construir o live-manual a partir do primeiro nível do
+diretório do seu git checkout executando:
+
+code{
+
+$ make build
+
+}code
+
+3~ Aplicando patches
+
+Diretamente cometer ao repoitório é possivel por qualquer um. No entanto,
+nós pedimo que você mande maiores mudanças para a lista de e-mail para
+discuti-las primeiro. Para enviar ao repositório, os seguintes passos são
+necessários:
+
+_* Obter a chave publica de commit:
+
+code{
+
+$ mkdir -p ~/.ssh/identity.d
+$ wget http://live.debian.net/other/keys/live-manual@debian-live \
+	-O ~/.ssh/identity.d/live-manual at debian-live
+$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \
+	-O ~/.ssh/identity.d/live-manual at debian-live.pub
+$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*
+
+}code
+
+_* Adicione a seguinte sessão na configuração do seu openssh-client:
+
+code{
+
+$ cat >> ~/.ssh/config << EOF
+Host live.debian.net
+        Hostname live.debian.net
+        User gitosis
+        IdentityFile ~/.ssh/identity.d/live-manual at debian-live
+EOF
+
+}code
+
+_* Fazer o checkout de um clone do manual por ssh:
+
+code{
+
+$ git clone gitosis at live.debian.net:/live-manual.git
+
+}code
+
+_* Depoi de editar os arquivos no manual/en/, por favor chame o alvo
+'commit' no nível superior do diretório para higiênizar os arquivos e
+atualizar os arquivos de tradução.  
+
+code{
+
+$ make commit
+
+}code
+
+_* Depois de higiênizar submeta as mudançãs. Escreva mensagens de submissão,
+que consistem em sentanças completas úteis, começando por letra maiuscula e
+acabando com uma parada total. Normalmente iniciando com as formas
+'Fixing/Adding/Removing/Correcting/':
+
+code{
+
+$ git commit -a
+
+}code
+
+_* Enviar as submissões para os servidor.
+
+code{
+
+$ git push
+
+}code
diff --git a/manual/de/about_project.ssi b/manual/pt_BR/about_project.ssi
similarity index 95%
copy from manual/de/about_project.ssi
copy to manual/pt_BR/about_project.ssi
index 993ea07..473de07 100644
--- a/manual/de/about_project.ssi
+++ b/manual/pt_BR/about_project.ssi
@@ -1,6 +1,6 @@
-:B~ Über das Debian Live Projekt
+:B~ About the Debian Live Project
 
-1~ Über das Debian Live Projekt
+1~ About the Debian Live Project
 
 2~ Motivation
 
@@ -73,20 +73,18 @@ are after a regular installation of Debian.
 Whenever we need a different default configuration, we will do that in
 coordination with its package maintainer in Debian.
 
-A system for configuring packages is provided using debconf in #{lh config}#
+A system for configuring packages is provided using debconf in #{lb config}#
 (use --preseed FILE) allowing custom configured packages to be installed in
 your custom produced Debian Live images, but for official live images only
 default configuration will be used. For more information, please see
-customization.
-
-% FIXME: <xref linkend="customization"/>
+{Customization overview}#customization-overview.
 
 Exception: There are a few essential changes needed to bring a live system
 to life (e.g. configuring pam to allow empty passwords). These essential
 changes have to be kept as minimal as possible and should be merged within
 the Debian repository if possible.
 
-2~ Contact
+2~contact Contact
 
 _* *{Mailing list}*: The primary contact for the project is the mailing list
 at http://lists.debian.org/debian-live/. You can email the list directly by
@@ -101,9 +99,7 @@ list.
 _* *{BTS}*: The Debian Bug Tracking System (BTS) contains details of bugs
 reported by users and developers. Each bug is given a number, and is kept on
 file until it is marked as having been dealt with. For more information,
-please see bugs.
-
-% FIXME: <xref linkend="bugs"/>
+please see {Reporting bugs}#bugs.
 
 _* *{Wiki}*: The Debian Live wiki at http://wiki.debian.org/DebianLive is a
 place to gather information, discuss applied technologies, and document
diff --git a/manual/pt_BR/index.html.in b/manual/pt_BR/index.html.in
new file mode 100644
index 0000000..b0b1b5e
--- /dev/null
+++ b/manual/pt_BR/index.html.in
@@ -0,0 +1,62 @@
+<html>
+
+<head>
+	<title>Projeto Debian Live</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+
+<body>
+	<h2>Manual do Debian Live</h2>
+
+	<p>
+		<i>Esse manual está sobre constante contrução.</i>
+	</p>
+
+	<p>
+		Por favor reporte erros, omissões, patches e sugestões para nossa lista de
+discussão em <a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
+e leia sobre <a href="html/1.html#37">como contribuir</a> com o manual.
+	</p>
+
+	<h3>Formatos Disponíveis</h3>
+
+	<ul>
+		<li><a href="epub/live-manual.epub">EPUB</a></li>
+		<li>HTML: <a href="html/index.html">Páginas multiplas</a>, <a
+href="html/live-manual.html">Página única</a></li>
+		<li><a href="odf/live-manual.odt">ODF</a></li>
+		<li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 retrato</a>, <a
+href="pdf/live-manual.landscape-a4.pdf">A4 paisagem</a>, <a
+href="pdf/live-manual.portrait-letter.pdf">US retrato</a>, <a
+href="pdf/live-manual.landscape-letter.pdf">US paisagem</a></li>
+		<li><a href="txt/live-manual.txt">Texto plano</a></li>
+	</ul>
+
+	<p>
+		Última modificação: @DATE_CHANGE@<br />
+		Última contrução: @DATE_BUILD@
+	</p>
+
+	<h3>Fonte</h3>
+
+	<p>
+		O fonte desse manual está diponível em um repositório <a
+href="http://git.or.cz/">git</a> em live.debian.net.
+	</p>
+
+	<ul>
+		<li>Navegue: <a
+href="http://live.debian.net/gitweb/?p=live-manual.git"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></a></li>
+		<li>Git: <a
+href="git://live.debian.net/git/live-manual.git"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a></li>
+	</ul>
+
+	<p>
+		<a href="http://live.debian.net/">Debian Live</a> &lt;<a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>&gt;
+- <a href="http://live.debian.net/legal.html">Aviso legal</a>
+	</p>
+</body>
+
+</html>
diff --git a/manual/en/live-manual.ssm b/manual/pt_BR/live-manual.ssm
similarity index 58%
copy from manual/en/live-manual.ssm
copy to manual/pt_BR/live-manual.ssm
index eaca0b5..21efbbf 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,12 +9,12 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-10-03
+ :published: 2010-10-25
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
 @make:
- :bold: /lenny|stable|squeeze|testing|sid|unstable/
+ :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
  :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
  :num_top: 1
  :skin: skin_debian-live
@@ -35,46 +35,56 @@
 
 << user_overview.ssi
 
+<< user_managing_a_configuration.ssi
+
+<< user_customization-overview.ssi
+
 << user_customization-packages.ssi
 
 << user_customization-contents.ssi
 
+<< user_customization-internationalization.ssi
+
 :B~ Development ~#
 
 :B~ Project ~#
 
-:B~ Other ~#
+<< project_bugs.ssi
 
-<< other_customization-internationalization.ssi
+:B~ Other ~#
 
-<< other_customization-bootup.ssi
+Other material that formerly appeared in this section is out of date and/or
+has not been approved for release. It has therefore been omitted, but can
+still be found in the document source; see 'About this manual'. Any part of
+the omitted material that is still useful will be included in the release
+only after it has been reviewed.
 
-<< other_customization-binary.ssi
+% << other_customization-bootup.ssi
 
-<< other_customization-backports.ssi
+% << other_customization-binary.ssi
 
-<< other_common-tasks.ssi
+% << other_customization-backports.ssi
 
-<< other_live-environment.ssi
+% << other_common-tasks.ssi
 
-<< other_faq.ssi
+% << other_live-environment.ssi
 
-<< other_reporting-bugs.ssi
+% << other_faq.ssi
 
-<< other_howtos.ssi
+% << other_howtos.ssi
 
-<< other_coding-style.ssi
+% << other_coding-style.ssi
 
-<< other_procedures.ssi
+% << other_procedures.ssi
 
-<< other_resources.ssi
+% << other_resources.ssi
 
-<< other_use-cases.ssi
+% << other_use-cases.ssi
 
-<< other_success-stories.ssi
+% << other_success-stories.ssi
 
-<< other_troubleshooting.ssi
+% << other_troubleshooting.ssi
 
-<< other_configuration-layout.ssi
+% << other_configuration-layout.ssi
 
-<< other_configuration-files.ssi
+% << other_configuration-files.ssi
diff --git a/manual/de/other_coding-style.ssi b/manual/pt_BR/other_coding-style.ssi
similarity index 100%
copy from manual/de/other_coding-style.ssi
copy to manual/pt_BR/other_coding-style.ssi
diff --git a/manual/de/other_common-tasks.ssi b/manual/pt_BR/other_common-tasks.ssi
similarity index 97%
copy from manual/de/other_common-tasks.ssi
copy to manual/pt_BR/other_common-tasks.ssi
index d93643b..98cb5d7 100644
--- a/manual/de/other_common-tasks.ssi
+++ b/manual/pt_BR/other_common-tasks.ssi
@@ -26,7 +26,7 @@ This means that Debian is installed by fetching and installing
 from the local media or some network-base network, resulting in a standard
 Debian system being installed to the hard disk.
 
-This whole process can be preseeded and customised in a number of ways; see
+This whole process can be preseeded and customized in a number of ways; see
 the relevant "DebianInstaller" wiki page and installation guide for
 more. This is operational now withing live-helper.
 
diff --git a/manual/de/other_configuration-files.ssi b/manual/pt_BR/other_configuration-files.ssi
similarity index 100%
copy from manual/de/other_configuration-files.ssi
copy to manual/pt_BR/other_configuration-files.ssi
diff --git a/manual/de/other_configuration-layout.ssi b/manual/pt_BR/other_configuration-layout.ssi
similarity index 100%
copy from manual/de/other_configuration-layout.ssi
copy to manual/pt_BR/other_configuration-layout.ssi
diff --git a/manual/de/other_customization-backports.ssi b/manual/pt_BR/other_customization-backports.ssi
similarity index 100%
copy from manual/de/other_customization-backports.ssi
copy to manual/pt_BR/other_customization-backports.ssi
diff --git a/manual/de/other_customization-binary.ssi b/manual/pt_BR/other_customization-binary.ssi
similarity index 94%
copy from manual/de/other_customization-binary.ssi
copy to manual/pt_BR/other_customization-binary.ssi
index 097216f..c717f53 100644
--- a/manual/de/other_customization-binary.ssi
+++ b/manual/pt_BR/other_customization-binary.ssi
@@ -1,6 +1,6 @@
-B~ Customising the binary image
+B~ Customizing the binary image
 
-1~ Customising the binary image<
+1~ Customizing the binary image<
 
 2~ ISO metadata
 
diff --git a/manual/de/other_customization-bootup.ssi b/manual/pt_BR/other_customization-bootup.ssi
similarity index 93%
copy from manual/de/other_customization-bootup.ssi
copy to manual/pt_BR/other_customization-bootup.ssi
index f656968..4fc11a7 100644
--- a/manual/de/other_customization-bootup.ssi
+++ b/manual/pt_BR/other_customization-bootup.ssi
@@ -1,8 +1,8 @@
-B~ Customising the bootup process
+B~ Customizing the bootup process
 
-1~ Customising the bootup process
+1~ Customizing the bootup process
 
-This chapter discusses customisation of bootup process of a live system,
+This chapter discusses customization of bootup process of a live system,
 including kernel options, modifications to the bootloader, "splash" screens
 and startup scripts.
 
diff --git a/manual/de/other_faq.ssi b/manual/pt_BR/other_faq.ssi
similarity index 99%
copy from manual/de/other_faq.ssi
copy to manual/pt_BR/other_faq.ssi
index 8df1daf..f754913 100644
--- a/manual/de/other_faq.ssi
+++ b/manual/pt_BR/other_faq.ssi
@@ -183,7 +183,7 @@ You must also use the example script
 script gets built into the initramfs (read the comment header for
 instructions).
 
-Q: How do I add software not in Debian ? A: See Customising package
+Q: How do I add software not in Debian ? A: See Customizing package
 installation % FIXME: <xref linkend="packages"/>
 
 Q: What is the manifest with Ubuntu used for? A: Manifest is just the
@@ -288,7 +288,7 @@ Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref
 linkend="internalization"/>
 
 Q: How do I get past boot prompt without a working keyboard? A: See
-Customising the bootup process % FIXME: <xref linkend="bootup"/> Note: Boot
+Customizing the bootup process % FIXME: <xref linkend="bootup"/> Note: Boot
 from an USB-HDD on an iMac with GRUB did not work.
 
 Q: Can I serve the root image from a web or ftp server? A: Since
diff --git a/manual/de/other_howtos.ssi b/manual/pt_BR/other_howtos.ssi
similarity index 100%
copy from manual/de/other_howtos.ssi
copy to manual/pt_BR/other_howtos.ssi
diff --git a/manual/de/other_live-environment.ssi b/manual/pt_BR/other_live-environment.ssi
similarity index 100%
copy from manual/de/other_live-environment.ssi
copy to manual/pt_BR/other_live-environment.ssi
diff --git a/manual/de/other_procedures.ssi b/manual/pt_BR/other_procedures.ssi
similarity index 99%
copy from manual/de/other_procedures.ssi
copy to manual/pt_BR/other_procedures.ssi
index a0c193f..2ecf1ca 100644
--- a/manual/de/other_procedures.ssi
+++ b/manual/pt_BR/other_procedures.ssi
@@ -96,7 +96,7 @@ Download location of updated images:
 
   <http://cdimage.debian.org/cdimage/release/current-live/>
 
-Debian Live Projekt Homepage:
+Debian Live project homepage:
 
   <http://live.debian.net/>
 
diff --git a/manual/de/other_resources.ssi b/manual/pt_BR/other_resources.ssi
similarity index 100%
copy from manual/de/other_resources.ssi
copy to manual/pt_BR/other_resources.ssi
diff --git a/manual/de/other_success-stories.ssi b/manual/pt_BR/other_success-stories.ssi
similarity index 100%
copy from manual/de/other_success-stories.ssi
copy to manual/pt_BR/other_success-stories.ssi
diff --git a/manual/de/other_troubleshooting.ssi b/manual/pt_BR/other_troubleshooting.ssi
similarity index 100%
copy from manual/de/other_troubleshooting.ssi
copy to manual/pt_BR/other_troubleshooting.ssi
diff --git a/manual/de/other_use-cases.ssi b/manual/pt_BR/other_use-cases.ssi
similarity index 100%
copy from manual/de/other_use-cases.ssi
copy to manual/pt_BR/other_use-cases.ssi
diff --git a/manual/de/other_reporting-bugs.ssi b/manual/pt_BR/project_bugs.ssi
similarity index 63%
copy from manual/de/other_reporting-bugs.ssi
copy to manual/pt_BR/project_bugs.ssi
index cf0c72a..c82d6cf 100644
--- a/manual/de/other_reporting-bugs.ssi
+++ b/manual/pt_BR/project_bugs.ssi
@@ -1,6 +1,6 @@
 B~ Reporting bugs
 
-1~ Reporting bugs
+1~bugs Reporting bugs
 
 Debian Live is far from being perfect, but we want to make it as close as
 possible to perfect - with your help. Do not hesitate to report a bug: it is
@@ -12,30 +12,30 @@ For the impatient:
 _* Always check first the image status updates on our homepage at
 http://live.debian.net/ for known issues.
 
-_* Always try to reproduce the bug with the *{most recent version}* of
-live-helper and live-initramfs before submitting a bug report.
+_* Always try to reproduce the bug with the *{most recent versions}* of
+live-build, live-boot, and live-config before submitting a bug report.
 
 _* Try to give *{as specific information as possible}* about the bug. This
-includes (at least) the version of live-helper and live-initramfs used and
-the distribution of the live system you are building.
+includes (at least) the version of live-build, live-boot, and live-config
+used and the distribution of the live system you are building.
 
 2~ Known issues
 
-Due to the nature of Debian testing and Debian unstable branches being a
-moving target, building a live system may not always be possible.
+Due to the nature of Debian testing and Debian unstable distributions being
+a moving target, building a live system may not always be possible.
 
 If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-helper does always default to the current stable
+but go with stable. live-build does always default to the current stable
 release.
 
 Currently known issues are listed under the section 'status' on our homepage
 at http://live.debian.net/
 
 It is out of the scope of this manual to train you in correctly identifying
-and fixing problems in packages of the development branches, however, there
-are two things you can always try: When not succeeding to build testing, try
-if unstable works. If unstable does not work either, revert to testing and
-pinning the newer version of the failing package from unstable.
+and fixing problems in packages of the development distributions, however,
+there are two things you can always try: When not succeeding to build
+testing, try if unstable works. If unstable does not work either, revert to
+testing and pinning the newer version of the failing package from unstable.
 
 2~ Rebuild from scratch
 
@@ -46,15 +46,12 @@ is reproducible.
 2~ Use up-to-date packages
 
 Using outdated packages can cause significant problems when trying to
-reproduce (and ultimately fix) your problem. If a relevant package is not
-available in Debian anymore, please recognize that the resources of the
-Debian kernel team are limited and will be unlikely to be able to fix the
-problem.
+reproduce (and ultimately fix) your problem.
 
-2~ Collect information
+2~collect-information Collect information
 
 Please provide enough information with your report. At a minimum, it should
-contain the exact version of live-helper version where the bug is
+contain the exact version of live-build version where the bug is
 encountered, and steps to reproduce it. Please use common sense and include
 other relevant information if you think that it might help in solving the
 problem.
@@ -64,9 +61,11 @@ information:
 
 _* Architecture of the host system
 
-_* Version of live-helper on the host system
+_* Version of live-build on the host system
+
+_* Version of live-boot on the live system
 
-_* Version of live-initramfs on the live system
+_* Version of live-config on the live system
 
 _* Version of debootstrap and/or cdebootstrap on the host system
 
@@ -78,7 +77,11 @@ _* Version of the kernel on the live system
 
 You can generate a log of the build process by using the tee command:
 
-% code{ % % lh_build 2>&1 | tee buildlog.txt % % }code
+code{
+
+lb build 2>&1 | tee build.log
+
+}code
 
 Additionally, to rule out other errors, it is always a good idea to tar up
 your config directory and upload it somewhere (do *{not}* send it as an
@@ -86,7 +89,7 @@ attachment to the mailinglist), so that we can try to reproduce the errors
 you encountered.
 
 Remember to send in any logs that were produced with English locale
-settings, e.g. run your live-helper commands with a leading #{LC_ALL=C}# or
+settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or
 #{LC_ALL=en_US}#.
 
 2~ Use the correct package to report the bug against
@@ -95,26 +98,26 @@ Where does the bug appear?
 
 3~ At build time whilst bootstrapping
 
-live-helper first bootstraps a basic Debian system with #{debootstrap}# or
+live-build first bootstraps a basic Debian system with #{debootstrap}# or
 #{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian
 distribution it is bootstrapping, it may fail. If a bug appears here, check
 if the error is related to a specific Debian package (most likely), or if it
-is related to cdebootstrap itself.
+is related to bootstrapping tool itself.
 
 In both cases, this is not a bug in Debian Live, but rather in Debian itself
-which we can not fix this directly. Please report such a bug against
-#{debootstrap}#, #{cdebootstrap}# or the failing package.
+which we can not fix this directly. Please report such a bug against the
+bootstrapping tool or the failing package.
 
 3~ At build time whilst installing packages
 
-live-helper installs additional packages from the Debian archive and
+live-build installs additional packages from the Debian archive and
 depending on the Debian distribution used and the daily archive state, it
 can fail. If a bug appears here, check if the error is also reproducible on
 a normal system.
 
 If this is the case, this is not a bug in Debian Live, but rather in Debian
 - please report it against the failing package. Running debootstrap
-seperately from the Live system build or running lh_bootstrap with
+seperately from the Live system build or running lb bootstrap with
 #{--debug}# will give you more information.
 
 Also, if you are using a local mirror and/or any of sort of proxy and you
@@ -124,11 +127,12 @@ bootstrapping from an official mirror.
 3~ At boot-time
 
 If your image does not boot, please report it to the mailing list together
-with the information requested in collect-information. Do not forget to
-mention, how/when the image failed, in Qemu, VMWare or real hardware. If you
-are using a virtualization technology of any kind, please always run it on
-real hardware before reporting a bug. Providing a screenshot of the failure
-is also very helpful.  % FIXME: <xref linkend="collect-information"/>
+with the information requested in {Collect
+information}#collect-information. Do not forget to mention, how/when the
+image failed, in Qemu, VMWare or real hardware. If you are using a
+virtualization technology of any kind, please always run it on real hardware
+before reporting a bug. Providing a screenshot of the failure is also very
+helpful.
 
 3~ At run-time
 
@@ -148,9 +152,9 @@ as the homepage, as these are likely to contain the most up-to-date
 information. If such information exists, always include the references to it
 in your bug report.
 
-In addition, you should check the current bug list for live-helper and the
-current bug list for live-initramfs at to see whether something similar has
-been reported already.
+In addition, you should check the current bug lists for live-build,
+live-boot, and live-config to see whether something similar has been
+reported already.
 
 2~ Where to report bugs
 
@@ -159,13 +163,12 @@ System (BTS). For information on how to use the system, please see
 http://bugs.debian.org/. You can also submit the bugs by using the
 #{reportbug}# command from the package with the same name.
 
-In general, you should report build time errors against the live-helper
-package and run time errors against live-initramfs. If you are unsure of
-which package is appropriate or need more help before submitting a bug
-report, please send a message to the mailing list and we will help you to
-figure it out.
+In general, you should report build time errors against the live-build
+package, boot time errors against live-boot, and run time errors against
+live-config. If you are unsure of which package is appropriate or need more
+help before submitting a bug report, please send a message to the mailing
+list and we will help you to figure it out.
 
 Please note that bugs found in distributions derived from Debian (such as
-Ubuntu, Knoppix, Xandros, etc.) should *{not}* be reported to the Debian BTS
-unless they can be also reproduced on a Debian system using official Debian
-packages.
+Ubuntu and others) should *{not}* be reported to the Debian BTS unless they
+can be also reproduced on a Debian system using official Debian packages.
diff --git a/manual/de/user_basics.ssi b/manual/pt_BR/user_basics.ssi
similarity index 93%
copy from manual/de/user_basics.ssi
copy to manual/pt_BR/user_basics.ssi
index f9b0843..aef09b7 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -10,9 +10,7 @@ containing instructions on how to boot the various binary image types.
 A live system usually means an operating system booted on a computer from a
 removable medium (such as CD-ROM, USB stick, or network), ready to use
 without any installation on the usual drive(s), with an auto-configuration
-done at runtime (see terms).
-
-% FIXME: <xref linkend="terms"/>
+done at runtime (see {Terms}#terms ).
 
 With Debian Live, it's a Debian GNU/Linux operating system, built for one of
 the supported architectures (currently amd64, i386, powerpc and sparc). It
@@ -26,8 +24,8 @@ _* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
 containing modules possibly needed to mount the filesystem's image and some
 scripts to do it.
 
-_* *{System image}*: The operating systems filesystem image. Debian Live
-uses SquashFS, a compressed filesystem, to minimize its image size. Note
+_* *{System image}*: The operating systems filesystem image. The SquashFS
+compressed filesystem is used to minimize the Debian Live image size. Note
 that it's read-only. So, during boot the Debian Live system will use a RAM
 disk and 'union' mechanism to enable writing files within the running
 system. However, all modifications will be lost upon shutdown unless
@@ -65,9 +63,7 @@ $ lb config
 }code
 
 By passing no parameters to #{lb config}# we indicated that we wish to use
-the defaults (see lb-config).
-
-% FIXME: <xref linkend="lb-config"/>
+the defaults (see {The lb config command}#lb-config ).
 
 Now that we have a "config/" hierarchy, we may build the image with the lb
 build command:
@@ -79,9 +75,7 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network
-connection (see lb-build).
-
-% FIXME: <xref linkend="lb-build"/>
+connection (see {The lb build command}#lb-build ).
 
 3~ Testing an ISO image with Qemu
 
@@ -111,6 +105,19 @@ build the required kernel modules to run virtualbox-ose.
 After successful installation, virtualbox can be e.g. found in the GNOME
 menu under 'Applications/System Tools/VirtualBox OSE'.
 
+Please consider including of following packages onto the live image to
+achieve higher resolution of the display when booting the live image in
+virutalbox-ose (1280x1024 instead of 800x600 and in particular if the
+default resolution of the virtualbox-ose display shouldn't work with the
+gui-installer).
+
+code{
+
+virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
+virtualbox-ose-guest-x11
+
+}code
+
 3~ Burning an ISO image to a physical medium
 
 Burning an ISO image is easy:
@@ -131,9 +138,8 @@ booting from USB sticks, USB hard drives, and various other portable storage
 devices.
 
 Note if you created an iso image with the previous example, you will need to
-clean up your working directory with the #{lb clean} command (see lb-clean):
-
-% FIXME: <xref linkend="lb-clean"/>
+clean up your working directory with the #{lb clean} command (see {The lb
+clean command}#lb-clean ):
 
 code{
 
@@ -321,7 +327,7 @@ code{
 
 dpkg-reconfigure -plow tftpd-hpa
 
-code}
+}code
 
 and fill in the new tftp server directory when being asked about it.
 
diff --git a/manual/de/user_customization-contents.ssi b/manual/pt_BR/user_customization-contents.ssi
similarity index 96%
copy from manual/de/user_customization-contents.ssi
copy to manual/pt_BR/user_customization-contents.ssi
index 7c43045..df28e53 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/pt_BR/user_customization-contents.ssi
@@ -1,8 +1,8 @@
-B~ Customising contents
+B~ Customizing contents
 
-1~ Customising contents
+1~customizing-contents Customizing contents
 
-This chapter discusses further customisation of the live system.
+This chapter discusses further customization of the live system.
 
 2~ Includes
 
diff --git a/manual/pt_BR/user_customization-internationalization.ssi b/manual/pt_BR/user_customization-internationalization.ssi
new file mode 100644
index 0000000..beb134a
--- /dev/null
+++ b/manual/pt_BR/user_customization-internationalization.ssi
@@ -0,0 +1,49 @@
+B~ Customizing locale and language
+
+1~customizing-locale-and-language Customizing locale and language
+
+2~ Default locale and keyboard
+
+The default locale when building a live cd is "locales=en_US.UTF-8", to set
+the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
+
+code{
+
+$ lb config --bootappend-live "locales=de_CH.UTF-8"
+
+}code
+
+The entry for a Swiss-German keyboard would be:
+
+code{
+
+$ lb config --bootappend-live "keyboard-layouts=ch"
+
+}code
+
+Combined, the keyboard and locale configured for Switzerland would be:
+
+code{
+
+$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
+
+}code
+
+Note: You can find a list of options in the manpage for
+live-config. Currently, only UTF-8 locales are supported.
+
+2~ l10n Packages
+
+An experimental feature of live-build is to automatically check for each
+package for which it is know that there are -l10n packages available and
+install them. To add German packages the entry would be
+
+code{
+
+$ lb config --language "de"
+
+}code
+
+This will also change the default syslinux language if translations are
+available or local translations have been put into
+#{config/templates/syslinux/de}#.
diff --git a/manual/pt_BR/user_customization-overview.ssi b/manual/pt_BR/user_customization-overview.ssi
new file mode 100644
index 0000000..517ca3d
--- /dev/null
+++ b/manual/pt_BR/user_customization-overview.ssi
@@ -0,0 +1,13 @@
+B~ Customizing contents
+
+1~customization-overview Customization overview
+
+% FIXME: just a stub for now.  In conversational style, cover the different
+kinds of customization % and link to each section within the text.
+
+This chapter gives an overview of the various ways in which your Debian live
+systems may be customized. See sections {Customizing package
+installation}#customizing-package-installation, {Customizing
+contents}#customizing-contents and {Customizing locale and
+language}#customizing-locale-and-language.
+
diff --git a/manual/de/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
similarity index 93%
copy from manual/de/user_customization-packages.ssi
copy to manual/pt_BR/user_customization-packages.ssi
index b848d7f..29fb5eb 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -1,6 +1,6 @@
-:B~ Customising package installation
+:B~ Customizing package installation
 
-1~ Customising package installation
+1~customizing-package-installation Customizing package installation
 
 _* Selecting additional packages to be installed
 
@@ -174,6 +174,17 @@ in order to be processed. Local packages lists always override package lists
 distributed with live-build. This can cause undesired effects, we therefore
 recommend to use unique names for local packages lists.
 
+*{Local binary packages lists}*
+
+In case you want to include some required .deb packages to live media's
+pool/ (without installing them onto the live image) you may need to use
+lists using binary local package lists stored in
+#{config/binary_local-packageslists}#. Such media can be used as a
+customized debian install image for offline installations.
+
+Package lists that exist in this directory need to have a .list suffix in
+order to be processed.
+
 *{Extending a provided package list using includes}*
 
 % FIXME
@@ -248,7 +259,7 @@ _* #{chroot_local-packages}#
 _* Using a custom APT repository
 
 The #{chroot_local-packages}# is simpler to achieve and useful for "one-off"
-customisations but has a number of drawbacks, whilst using a custom APT
+customizations but has a number of drawbacks, whilst using a custom APT
 repository is more time-consuming to set up.
 
 3~ Using #{chroot_local-packages}# to install custom packages
diff --git a/manual/de/user_installation.ssi b/manual/pt_BR/user_installation.ssi
similarity index 90%
copy from manual/de/user_installation.ssi
copy to manual/pt_BR/user_installation.ssi
index d330950..9869ff4 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/pt_BR/user_installation.ssi
@@ -84,7 +84,9 @@ and uninstall it with:
 
 code{
 
-# make uninstall }code
+# make uninstall
+
+}code
 
 3~ From 'snapshots'
 
@@ -94,14 +96,12 @@ are available on http://live.debian.net/debian/.
 
 2~ live-boot
 
-*{Note:}* You do not need to install live-boot on your system to create customised Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
 
-3~ Using a customised live-boot
+3~ Using a customized live-boot
 
 To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in terms.
-
-% FIXME: <xref linkend="terms"/>
+familiar with the terms mentioned in {Terms}#terms .
 
 _* Checkout the live-boot source
 
@@ -120,8 +120,8 @@ should name it without dashes '-', e.g: call it "99new_feature" and not
 _* Build a live-boot .deb
 
 You must build either on your target distribution or in a chroot containing
-your target platform: this means if your target is squeeze then you should
-build against squeeze. You can use a personal builder such as /{pbuilder}/
+your target platform: this means if your target is Squeeze then you should
+build against Squeeze. You can use a personal builder such as /{pbuilder}/
 or /{sbuild}/ to automate building packages in chroot. To build directly on
 the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/
 package):
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
new file mode 100644
index 0000000..3047ef0
--- /dev/null
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -0,0 +1,83 @@
+:B~ Managing a configuration
+
+1~ Managing a configuration
+
+This chapter explains how to manage a live configuration from initial
+creation, through successive revisions and successive releases of both the
+live-build software and the live image itself.
+
+2~ Use auto to manage configuration changes
+
+Live configurations rarely are perfect on the first try. You'll likely need
+to make a series of revisions until you are satisfied. However,
+inconsistencies can creep into your configuration from one revision to the
+next if you aren't careful. The main problem is, once a variable is given a
+default value, that value will not be recomputed from other variables that
+may change in later revisions.
+
+For example, when the distribution is first set, many 'dependent' variables
+are given default values that suit that distribution. However, if you later
+decide to change the distribution, those dependent variables continue to
+retain old values that are no longer appropriate.
+
+A second, related problem is that if you run #{lb config}# and then upgrade
+to a new version of live-build that has changed one of the variable names,
+you will discover this only by manual review of the variables in your config
+files, which you will then need to use to set the appropriate option again.
+
+All of this would be a terrible nuisance if it weren't for auto/* scripts,
+simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
+that are designed to help you manage your configuration. Simply create an
+auto/config script containing #{lb config}# command with all desired
+options, and an auto/clean that removes the files containing configuration
+variable values, and each time you #{lb config}# and #{lb clean}#, these
+files will be executed. This will ensure that your configuration is kept
+internally consistent from one revision to the next and from one live-build
+release to the next (though you will still have to take care and read the
+documentation when you upgrade live-build and make adjustments as needed).
+
+2~ Example auto scripts
+
+Use the following auto script examples as the starting point for your new
+live-build configuration. Take note that when you call the #{lb}# command
+that the auto script wraps, you must specify #{noauto}# as its parameter to
+ensure that the auto script isn't called again, recursively.
+
+auto/config
+
+code{
+
+#!/bin/sh
+lb config noauto \
+	--architecture i386 \
+	${@}
+
+}code
+
+auto/clean
+
+code{
+
+#!/bin/sh
+lb clean noauto ${@}
+rm -f config/binary config/bootstrap \
+	config/chroot config/common config/source
+rm -f binary.log
+
+}code
+
+auto/build
+
+code{
+
+#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log
+
+}code
+
+Edit auto/config, changing or adding any options as you see fit. In the
+example above, --architecture is set to i386 so that when the image is built
+on an amd64 system, it will not default to building amd64 images. Change
+this to an appropriate value for your image (or delete it if you want to use
+the default) and add any additional options in continuation lines that
+follow.
+
diff --git a/manual/de/user_overview.ssi b/manual/pt_BR/user_overview.ssi
similarity index 84%
copy from manual/de/user_overview.ssi
copy to manual/pt_BR/user_overview.ssi
index 49fdf79..9c7e8ff 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -2,10 +2,10 @@
 
 1~ Overview of tools
 
-This chapter contains an overview of the two main tools used in building
-Debian Live systems.
+This chapter contains an overview of the three main tools used in building
+Debian Live systems: live-build, live-boot and live-config.
 
-2~ live-build
+2~live-build live-build
 
 live-build is a collection of scripts to build Debian Live systems. These
 scripts are also referred to as "commands".
@@ -30,9 +30,7 @@ each command.
 Unlike debhelper, live-build contains a tool to generate a skeleton
 configuration directory, #{lb config}#. This could be considered to be
 similar to tools such as #{dh-make}#. For more information about #{lb
-config}#, please see lb-config.
-
-% FIXME: <xref linkend="lb-config"/>
+config}#, please see {The lb config command}#lb-config.
 
 Besides the common config/common, which is used by all live-build commands,
 some additional files can be used to configure the behavior of specific
@@ -65,35 +63,24 @@ dpkg --print-architecture and "dist" is the same as the codename of the
 target distribution), then they will be used in preference to the other,
 more general files.
 
-Please see installation for information on how to install live-build.
-
-% FIXME: <xref linkend="installation"/>
-
 The remainder of this section discusses the three most important commands:
 
-_* *{lb config}*: Responsible for initialising a Live system configuration
-directory. See lb-config for more information.
-
-% FIXME: <xref linkend="lb-config"/>
-
-_* *{lb build}*: Responsible for starting a Live system build. See lb-build
-for more information.
+_* *{lb config}*: Responsible for initializing a Live system configuration
+directory. See {The lb config command}#lb-config for more information.
 
-% FIXME: <xref linkend="lb-build"/>
+_* *{lb build}*: Responsible for starting a Live system build. See {The lb
+build command}#lb-build for more information.
 
 _* *{lb clean}*: Responsible for removing parts of a Live system build. See
-lb-clean for more information.
+{The lb clean command}#lb-clean for more information.
 
-% FIXME: <xref linkend="lb-clean"/
+3~lb-config The #{lb config}# command
 
-3~ The #{lb config}# command
-
-As discussed in live-build, the scripts that make up live-build source their
-configuration from a single directory named config/. As constructing this
-directory by hand would be time-consuming and error-prone, the #{lb config}#
-command can be used to create skeleton configuration folders.
-
-% FIXME: <xref linkend="live-build"/>
+As discussed in {live-build}#live-build, the scripts that make up live-build
+source their configuration from a single directory named config/. As
+constructing this directory by hand would be time-consuming and error-prone,
+the #{lb config}# command can be used to create skeleton configuration
+folders.
 
 Issuing #{lb config}# without any arguments creates a config subdirectory
 which it populates with some default settings:
@@ -156,18 +143,18 @@ $ lb config --binary-images net --hostname live-machine --username live-user
 A full list of options is available in the #{lb_config}# man page. Most
 options have a parallel with an "LB_" prefixed variable.
 
-3~ The #{lb build}# command
+3~lb-build The #{lb build}# command
 
 The #{lb build}# command reads in your configuration from the config/
 directory. It then runs the lower lower level commands needed to build your
 Live system.
 
-3~ The #{lb clean}# command
+3~lb-clean The #{lb clean}# command
 
 It is the job of the #{lb clean}# command to remove various parts of a build
 so subsequent builds can start from a clean state.
 
-2~ The live-boot package
+2~live-boot The live-boot package
 
 live-boot is a collection of scripts providing hooks for the
 initramfs-tools, used to generate an initramfs capable of booting live
@@ -182,3 +169,11 @@ Debian like systems to boot from.
 More information on initial ramfs in Debian can be found in the Debian Linux
 Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter
 on initramfs.
+
+2~live-config The live-config package
+
+live-config consists of the scripts that run at boot time after live-boot to
+configure the live system automatically. It handles such tasks as setting
+the hostname, locales and timezone, creating the live user, inhibiting cron
+jobs and performing autologin of the live user.
+
diff --git a/manual/de/_sisu/.empty b/manual/ro/_sisu/.empty
similarity index 100%
copy from manual/de/_sisu/.empty
copy to manual/ro/_sisu/.empty
diff --git a/manual/de/_sisu/.empty b/manual/ro/_sisu/image/.empty
similarity index 100%
copy from manual/de/_sisu/.empty
copy to manual/ro/_sisu/image/.empty
diff --git a/manual/de/_sisu/sisurc.yml b/manual/ro/_sisu/sisurc.yml
similarity index 100%
copy from manual/de/_sisu/sisurc.yml
copy to manual/ro/_sisu/sisurc.yml
diff --git a/manual/de/_sisu/skin/doc/skin_debian-live.rb b/manual/ro/_sisu/skin/doc/skin_debian-live.rb
similarity index 100%
copy from manual/de/_sisu/skin/doc/skin_debian-live.rb
copy to manual/ro/_sisu/skin/doc/skin_debian-live.rb
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
new file mode 100644
index 0000000..71a6e7f
--- /dev/null
+++ b/manual/ro/about_manual.ssi
@@ -0,0 +1,212 @@
+:B~ Despre acest manual
+
+1~ Despre acest manual
+
+Scopul principal al acestui manual este de a accesa intreaga documentatie a
+proiectului Debian Live intr-un singur loc. Dar aici nu vor fii gasite
+documantatii pentru utilizatorul final cu exceptia celor legate de sistemul
+live.
+
+Anumite comenzi din text trebuie sa fie executate ca 'super_utilizator',
+privilegiu care poate fi obtinut fie prin comanda #{su}, sau #{sudo}. Pentru
+a distinge intre acesti utilizatori se vor folosi #{$}# respectiv #{#}#
+. Aceste simboluri nu fac parte din comenzi.
+
+2~terms Termeni
+
+_* *{Live system}*: Un sistem de operare care porneste fara a instala pe
+discul dur. Un sistem live nu altereaza un sistem de operare local sau
+fisiere deja instalate pe discul dur ci doar dace se mentioneaza expres
+acest lucru. Sistemele livefolosesc spre pornire medii ca CDs, DVDs sau chei
+USB. Unele chiar pot porni prin retaua de net.
+
+_* *{Debian Live}*: Sub-proiectul Debian care gereaza pachetele live-boot,
+live-build, live-config, si live-manual.
+
+_* *{Debian Live system}*: Un sistem live care foloseste programe din
+sitemul de operare Debian, si care poate fi pornit folosind CDs, DVDs, chei
+USB, sau reteaua net (via netboot images), sau prin nternet (via boot
+parameter #{fetch=URL}#).
+
+_* *{Host system}*: Mediul folosit pentru crearea sistemului live pe un
+sistem dat.
+
+_* *{Target system}*: Mediul folosit pentru rularea sistemului live.
+
+_* *{live-boot}*: O coloctie se scripte folosite la pornirea sistemului
+live. live-boot a facul parte formal din live-initramfs.
+
+_* *{live-build}*: O colectie de scripte folosite la particularizatrea
+sistemelor Debian Live. live-build a fost cunoscut ca live-helper, iar mai
+inainte ca live-package.
+
+_* *{live-config}*: O colectie de scripte folosite la configurarea sitemului
+live in timpul procesului de pornire. live-config a fost cunoscut ca parte
+din live-initramfs.
+
+_* *{live-manual}*: Acest document face parte din pachetul numit
+live-manual.
+
+_* *{Debian Installer (d-i)}*: Sistemul de instalare oficial pentru
+distributia Debian.
+
+_* *{Boot parameters}*: Parameti care pot fi adaugati la promptul
+bootloader-ului care sa infuenteze kernelul sau live-config.
+
+_* *{chroot}*: Programul chroot , chroot(8), permite rularea a diferite
+instante din mediul GNU/Linux pe un singur sistem si in simultan fara a
+necesita o repornire a sistemului.
+
+_* *{Binary image}*: Un fisier ce contine sistemul live, ca de exemplu
+binary.iso sau binary.img.
+
+_* *{Target distribution}*: Dea pe care se bazeaza sistemul live. Aceasta
+distributie poate fi diferita de cea a sistemului gazda.
+
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: stable contine ultima
+versiune oficiala a distributiei Debian. testing este sursa pentru
+urmatoarea versiune stable. Pricipalul avantaj la folosirea distibutiei
+testing este folosirea programelor mai noi decat cele din
+stable. Distributia unstable este locul unde au loc activ dezvoltarile din
+Debian. In general ea este folosita de dezvoltatori sau de cei ce le place
+riscul ... .
+
+La momentul in care au fost scrise aceste randurei, versiunea stable este
+Squeeze, Wheezy estei versiunea testing. Sid va fi mereu simbolul versiunii
+unstable.
+
+2~ Autori
+
+Lista autorilor (in ordine alfabetica):
+
+_* Ben Armstrong
+
+_* Brendan Sleight
+
+_* Chris Lamb
+
+_* Daniel Baumann
+
+_* Franklin Piat
+
+_* Jonas Stein
+
+_* Kai Hendry
+
+_* Marco Amadori
+
+_* Mathieu Geli
+
+_* Matthias Kirschner
+
+_* Richard Nelson
+
+_* Trent W. Buck
+
+2~ Cum se poate contribui la acest document
+
+Acest manual este conceput ca un proiect comunitar si astfel orice
+propozitie sau inbunatatire sunt bune venite. Principala cale de a face o
+contributie este trimeterea unui mail la mailing list. Vedeti
+{Contact}#contact pentru mai multe informatii.
+
+In orice contributie trimisa va rog sa precizati in clar cine detine
+copyright-ul si sub ce licenta este publicata. A se nota ca o contrinutie
+este acceptata daca este licentiata in acceeasi termeni ca si restul
+documentului , adica GPL version 3 or later.
+
+Sursele acestui manual sunt gerate folosind Git version control
+system. Pute-ti checkout ultima copie prin executarea :
+
+code{
+
+$ git clone git://live.debian.net/git/live-manual.git
+
+}code
+
+Inainte de a trimite contibutia dvs, este de dorit sa efectuati o
+previzualizare a lucrarii. Pentru aceasta verifica-ti ca pachetele necesare
+pentru 'building' sunt instalate, prin executatea comenzii:
+
+code{
+
+# apt-get install make po4a sisu-complete
+
+}code
+
+Pute-ti crea live-manual de la nivelul de sus al directorului git checkout
+al dvs, prin executatea:
+
+code{
+
+$ make build
+
+}code
+
+3~ Aplicarea de patch-uri
+
+Commiterea in direct este la indemana oricui. Totusi, va rugam sa trimeteti
+schimbarile mai mari , spre discutie , la mailing list. Pentru a fi trimise
+contibutiile la repository, pasii urmatori sunt necesari:
+
+_* Fetch the public commit key:
+
+code{
+
+$ mkdir -p ~/.ssh/identity.d
+$ wget http://live.debian.net/other/keys/live-manual@debian-live \
+	-O ~/.ssh/identity.d/live-manual at debian-live
+$ wget http://live.debian.net/other/keys/live-manual@debian-live.pub \
+	-O ~/.ssh/identity.d/live-manual at debian-live.pub
+$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*
+
+}code
+
+_* Adaugati urmatoarea sectiuna la openssh-client config:
+
+code{
+
+$ cat >> ~/.ssh/config << EOF
+Host live.debian.net
+        Hostname live.debian.net
+        User gitosis
+        IdentityFile ~/.ssh/identity.d/live-manual at debian-live
+EOF
+
+}code
+
+_* Checkout un clon al manualului prin ssh:
+
+code{
+
+$ git clone gitosis at live.debian.net:/live-manual.git
+
+}code
+
+_* Dupa editarea de fisiere in manual/en/, va rugam folositi 'commit' in the
+top level directory to sanitize the files and update the translation files:
+
+code{
+
+$ make commit
+
+}code
+
+_* Dupa 'sanitizare' 'commit' schimbarile. Scrieti mesajele de commit, care
+constau in propozitii clare, care incep cu litere Mari, si se incheie cu
+punct si sens. Inceputul poate fii de forma
+'Fixing/Adding/Removing/Correcting/':
+
+code{
+
+$ git commit -a
+
+}code
+
+_* Primite commit-ul la server:
+
+code{
+
+$ git push
+
+}code
diff --git a/manual/ro/about_project.ssi b/manual/ro/about_project.ssi
new file mode 100644
index 0000000..49a81c2
--- /dev/null
+++ b/manual/ro/about_project.ssi
@@ -0,0 +1,109 @@
+:B~ Despre Proiectul Debian Live
+
+1~ Despre Proiectul Debian Live
+
+2~ Motivatie
+
+3~ Ce nu e bine cu sistemele live actuale
+
+La momentul de inceput al proiectului Debian Live existau deja cateva
+sisteme Debian live si ele au depus o munca interesanta. Din perspectiva
+Debian marea majoritate a acestor sisteme au urmatoarele dezavantaje:
+
+_* Sunt proiecte neoficiale, dezvoltate in afara proiectului Debian.
+
+_* Ele amalgameaza diferite distributii, ca testing si unstable.
+
+_* Ele suporta doar arhitectura i386.
+
+_* Ele au modificat comportamentul si /sau aspectul programelor pentru a
+castuga spatiu.
+
+_* Ele includ programe neoficiale.
+
+_* Ele folosesc kernele modificate care contin patch-uri ce nu fac parte din
+Debian.
+
+_* Ele sunt greoaie si lente datorete marimii lor si deci inapropiate pentru
+situatii de salvare/rescue.
+
+_* Ele nu sunt disponibile in diferite sosuri ca CDs, DVDs, USB-stick si
+netboot images.
+
+3~ De ce e nevoie de propriul nostru sistem live ?
+
+Debian este 'the Universal Operating System/Sistemul de Operare Universal' :
+Debian are un sistem live oficial pentru a se arata in jur si a reprezenta
+oficial adevarul, doar sistemul Debian are principalele avantaje:
+
+_* Acesta va fi un subpriect Debian oficial.
+
+_* El reflecta starea (actuala) a distributiei.
+
+_* Se poate utiliza pe maximum de arhitecturi posibile.
+
+_* Contine doar programe Debian.
+
+_* Nu contine programe neoficiale.
+
+_* Foloseste un kernel Debian nealterat, fara patch-uri aditionale.
+
+2~ Filozofia
+
+3~ Doar programe oficiale, fara schimbari.
+
+Vor fi folosite doar programe oficiale din depozitele Debian sectiunea
+"main". Sectiunea non-free nu e parte din Debian si deci nu poate fi
+folosita in nici un fel la construirea imaginilor live oficiale.
+
+Nu vor fi facute nici o schimbare in programe. Daca este nevoie de acest
+lucru, schimbarile vor fi facute in coordonare cu responsabilul de program
+din Debian.
+
+Ca o exceptie, programele specifice ca live-boot, live-build sau live-config
+pot fi folosite temporar din depozitele proprii live, pentru nevoi de
+dezvoltare. (de exemplu pentru creerea de development snapshots). Acestea
+vor fi upload-ate in Debian la date cuvenite.
+
+3~ Nu vor fi programe de configurare pentru sistemul live.
+
+In aceasta faza nu vor fi propuse sau instalate example sau configuratii
+alternative. Toate programele sunt folosite cu configuratia default 'de
+baza', la fel ca in instalatia normaladin Debian.
+
+In caz de nevoie a unei configuratii diferite, aceasta schimbare va fii
+facuta in coordonare cu responsabilui de program din Debian.
+
+Cu toate acestea un sistem de configurare a programelor este permisa
+folosind debconf in #{lb config}# (use --preseed FILE), ce permite o
+particularizare a configurari programelor in sistemul live facur de dvs.,
+insa imaginile oficiale live doar configurari de baza vot fi
+folosite. Pentru mai multe informatii, urmariti {Customization
+overview}#customization-overview.
+
+Exceptie: Sunt desigur necesare cateva necesare sa aducem 'la viata' un
+sistem live ( de exemplu: configuratea pam care sa permita empty
+passwords). Dar aceste schimbari esentiale trebuie minimizate la maximum si
+pastrate in concordanta cu depozitul Debian.
+
+2~contact Contact
+
+_* *{Mailing list}*: Principalul mod de contact din proiect este mailing
+list la http://lists.debian.org/debian-live/.Va pute-ti adresa in direct
+prin mail la debian-live at lists.debian.org. Arhiva listei o gasi-ti la
+http://lists.debian.org/debian-live/.
+
+_* *{IRC}*: Un numar de utilizatori si dezvoltatori sunt prezenti in canalul
+#debian-live pe n irc.debian.org (OFTC). Daca aveti o intrebare pentru IRC ,
+fiti cu multa rabdare in asteptarea raspunsului. In caz de lipsa a unui
+raspuns , folositi mailing list.
+
+_* *{BTS}*: BTS adica Debian Bug Tracking System , contine detalii asupra
+rapoartelor de bug facute de utilizatorisau dezvoltatori. Fiecare bug are un
+numar, si este mentinut deschis pana la rezolvare. Alte informatii gasiti la
+{Reporting bugs}#bugs.
+
+_* *{Wiki}*: Debian Live are un wiki la http://wiki.debian.org/DebianLive ,
+si este locul unde pot fi gasite diferite informatii, se discuta modul de
+aplicare de tehnologii, sau sunt documentate alte lucrari legate de debian
+live si care pot depasi cadrul acestui document.
diff --git a/manual/ro/index.html.in b/manual/ro/index.html.in
new file mode 100644
index 0000000..b23eb38
--- /dev/null
+++ b/manual/ro/index.html.in
@@ -0,0 +1,62 @@
+<html>
+
+<head>
+	<title>Debian Live Project</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+
+<body>
+	<h2>Debian Live Manual</h2>
+
+	<p>
+		<i>This manual is under heavy construction.</i>
+	</p>
+
+	<p>
+		Please report errors, omissions, patches and suggestions to our mailinglist
+at <a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
+and read about <a href="html/1.html#37">how to contribute</a> to the manual.
+	</p>
+
+	<h3>Available Formats</h3>
+
+	<ul>
+		<li><a href="epub/live-manual.epub">EPUB</a></li>
+		<li>HTML: <a href="html/index.html">multi page</a>, <a
+href="html/live-manual.html">single page</a></li>
+		<li><a href="odf/live-manual.odt">ODF</a></li>
+		<li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape-a4.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait-letter.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape-letter.pdf">letter landscape</a></li>
+		<li><a href="txt/live-manual.txt">Plain text</a></li>
+	</ul>
+
+	<p>
+		Last changed: @DATE_CHANGE@<br />
+		Last built: @DATE_BUILD@
+	</p>
+
+	<h3>Source</h3>
+
+	<p>
+		The sources for this manual is available in a <a
+href="http://git.or.cz/">git</a> repository at live.debian.net.
+	</p>
+
+	<ul>
+		<li>Browse: <a
+href="http://live.debian.net/gitweb/?p=live-manual.git"><small><tt>http://live.debian.net/gitweb/?p=live-manual.git</tt></small></a></li>
+		<li>Git: <a
+href="git://live.debian.net/git/live-manual.git"><small><tt>git://live.debian.net/git/live-manual.git</tt></small></a></li>
+	</ul>
+
+	<p>
+		<a href="http://live.debian.net/">Debian Live</a> &lt;<a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>&gt;
+- <a href="http://live.debian.net/legal.html">Legal Notice</a>
+	</p>
+</body>
+
+</html>
diff --git a/manual/en/live-manual.ssm b/manual/ro/live-manual.ssm
similarity index 58%
copy from manual/en/live-manual.ssm
copy to manual/ro/live-manual.ssm
index eaca0b5..21efbbf 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,12 +9,12 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2010-10-03
+ :published: 2010-10-25
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
 @make:
- :bold: /lenny|stable|squeeze|testing|sid|unstable/
+ :bold: /Squeeze|squeeze|Stable|stable|Wheezy|wheezy|Testing|testing|Sid|sid|Unstable|unstable/
  :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
  :num_top: 1
  :skin: skin_debian-live
@@ -35,46 +35,56 @@
 
 << user_overview.ssi
 
+<< user_managing_a_configuration.ssi
+
+<< user_customization-overview.ssi
+
 << user_customization-packages.ssi
 
 << user_customization-contents.ssi
 
+<< user_customization-internationalization.ssi
+
 :B~ Development ~#
 
 :B~ Project ~#
 
-:B~ Other ~#
+<< project_bugs.ssi
 
-<< other_customization-internationalization.ssi
+:B~ Other ~#
 
-<< other_customization-bootup.ssi
+Other material that formerly appeared in this section is out of date and/or
+has not been approved for release. It has therefore been omitted, but can
+still be found in the document source; see 'About this manual'. Any part of
+the omitted material that is still useful will be included in the release
+only after it has been reviewed.
 
-<< other_customization-binary.ssi
+% << other_customization-bootup.ssi
 
-<< other_customization-backports.ssi
+% << other_customization-binary.ssi
 
-<< other_common-tasks.ssi
+% << other_customization-backports.ssi
 
-<< other_live-environment.ssi
+% << other_common-tasks.ssi
 
-<< other_faq.ssi
+% << other_live-environment.ssi
 
-<< other_reporting-bugs.ssi
+% << other_faq.ssi
 
-<< other_howtos.ssi
+% << other_howtos.ssi
 
-<< other_coding-style.ssi
+% << other_coding-style.ssi
 
-<< other_procedures.ssi
+% << other_procedures.ssi
 
-<< other_resources.ssi
+% << other_resources.ssi
 
-<< other_use-cases.ssi
+% << other_use-cases.ssi
 
-<< other_success-stories.ssi
+% << other_success-stories.ssi
 
-<< other_troubleshooting.ssi
+% << other_troubleshooting.ssi
 
-<< other_configuration-layout.ssi
+% << other_configuration-layout.ssi
 
-<< other_configuration-files.ssi
+% << other_configuration-files.ssi
diff --git a/manual/de/other_coding-style.ssi b/manual/ro/other_coding-style.ssi
similarity index 100%
copy from manual/de/other_coding-style.ssi
copy to manual/ro/other_coding-style.ssi
diff --git a/manual/de/other_common-tasks.ssi b/manual/ro/other_common-tasks.ssi
similarity index 97%
copy from manual/de/other_common-tasks.ssi
copy to manual/ro/other_common-tasks.ssi
index d93643b..98cb5d7 100644
--- a/manual/de/other_common-tasks.ssi
+++ b/manual/ro/other_common-tasks.ssi
@@ -26,7 +26,7 @@ This means that Debian is installed by fetching and installing
 from the local media or some network-base network, resulting in a standard
 Debian system being installed to the hard disk.
 
-This whole process can be preseeded and customised in a number of ways; see
+This whole process can be preseeded and customized in a number of ways; see
 the relevant "DebianInstaller" wiki page and installation guide for
 more. This is operational now withing live-helper.
 
diff --git a/manual/de/other_configuration-files.ssi b/manual/ro/other_configuration-files.ssi
similarity index 100%
copy from manual/de/other_configuration-files.ssi
copy to manual/ro/other_configuration-files.ssi
diff --git a/manual/de/other_configuration-layout.ssi b/manual/ro/other_configuration-layout.ssi
similarity index 100%
copy from manual/de/other_configuration-layout.ssi
copy to manual/ro/other_configuration-layout.ssi
diff --git a/manual/de/other_customization-backports.ssi b/manual/ro/other_customization-backports.ssi
similarity index 100%
copy from manual/de/other_customization-backports.ssi
copy to manual/ro/other_customization-backports.ssi
diff --git a/manual/de/other_customization-binary.ssi b/manual/ro/other_customization-binary.ssi
similarity index 94%
copy from manual/de/other_customization-binary.ssi
copy to manual/ro/other_customization-binary.ssi
index 097216f..c717f53 100644
--- a/manual/de/other_customization-binary.ssi
+++ b/manual/ro/other_customization-binary.ssi
@@ -1,6 +1,6 @@
-B~ Customising the binary image
+B~ Customizing the binary image
 
-1~ Customising the binary image<
+1~ Customizing the binary image<
 
 2~ ISO metadata
 
diff --git a/manual/de/other_customization-bootup.ssi b/manual/ro/other_customization-bootup.ssi
similarity index 93%
copy from manual/de/other_customization-bootup.ssi
copy to manual/ro/other_customization-bootup.ssi
index f656968..4fc11a7 100644
--- a/manual/de/other_customization-bootup.ssi
+++ b/manual/ro/other_customization-bootup.ssi
@@ -1,8 +1,8 @@
-B~ Customising the bootup process
+B~ Customizing the bootup process
 
-1~ Customising the bootup process
+1~ Customizing the bootup process
 
-This chapter discusses customisation of bootup process of a live system,
+This chapter discusses customization of bootup process of a live system,
 including kernel options, modifications to the bootloader, "splash" screens
 and startup scripts.
 
diff --git a/manual/de/other_faq.ssi b/manual/ro/other_faq.ssi
similarity index 99%
copy from manual/de/other_faq.ssi
copy to manual/ro/other_faq.ssi
index 8df1daf..f754913 100644
--- a/manual/de/other_faq.ssi
+++ b/manual/ro/other_faq.ssi
@@ -183,7 +183,7 @@ You must also use the example script
 script gets built into the initramfs (read the comment header for
 instructions).
 
-Q: How do I add software not in Debian ? A: See Customising package
+Q: How do I add software not in Debian ? A: See Customizing package
 installation % FIXME: <xref linkend="packages"/>
 
 Q: What is the manifest with Ubuntu used for? A: Manifest is just the
@@ -288,7 +288,7 @@ Q: How do I configure the locale and the keyboard? A: See 10n % FIXME: <xref
 linkend="internalization"/>
 
 Q: How do I get past boot prompt without a working keyboard? A: See
-Customising the bootup process % FIXME: <xref linkend="bootup"/> Note: Boot
+Customizing the bootup process % FIXME: <xref linkend="bootup"/> Note: Boot
 from an USB-HDD on an iMac with GRUB did not work.
 
 Q: Can I serve the root image from a web or ftp server? A: Since
diff --git a/manual/de/other_howtos.ssi b/manual/ro/other_howtos.ssi
similarity index 100%
copy from manual/de/other_howtos.ssi
copy to manual/ro/other_howtos.ssi
diff --git a/manual/de/other_live-environment.ssi b/manual/ro/other_live-environment.ssi
similarity index 100%
copy from manual/de/other_live-environment.ssi
copy to manual/ro/other_live-environment.ssi
diff --git a/manual/de/other_procedures.ssi b/manual/ro/other_procedures.ssi
similarity index 99%
copy from manual/de/other_procedures.ssi
copy to manual/ro/other_procedures.ssi
index a0c193f..2ecf1ca 100644
--- a/manual/de/other_procedures.ssi
+++ b/manual/ro/other_procedures.ssi
@@ -96,7 +96,7 @@ Download location of updated images:
 
   <http://cdimage.debian.org/cdimage/release/current-live/>
 
-Debian Live Projekt Homepage:
+Debian Live project homepage:
 
   <http://live.debian.net/>
 
diff --git a/manual/de/other_resources.ssi b/manual/ro/other_resources.ssi
similarity index 100%
copy from manual/de/other_resources.ssi
copy to manual/ro/other_resources.ssi
diff --git a/manual/de/other_success-stories.ssi b/manual/ro/other_success-stories.ssi
similarity index 100%
copy from manual/de/other_success-stories.ssi
copy to manual/ro/other_success-stories.ssi
diff --git a/manual/de/other_troubleshooting.ssi b/manual/ro/other_troubleshooting.ssi
similarity index 100%
copy from manual/de/other_troubleshooting.ssi
copy to manual/ro/other_troubleshooting.ssi
diff --git a/manual/de/other_use-cases.ssi b/manual/ro/other_use-cases.ssi
similarity index 100%
copy from manual/de/other_use-cases.ssi
copy to manual/ro/other_use-cases.ssi
diff --git a/manual/de/other_reporting-bugs.ssi b/manual/ro/project_bugs.ssi
similarity index 63%
rename from manual/de/other_reporting-bugs.ssi
rename to manual/ro/project_bugs.ssi
index cf0c72a..c82d6cf 100644
--- a/manual/de/other_reporting-bugs.ssi
+++ b/manual/ro/project_bugs.ssi
@@ -1,6 +1,6 @@
 B~ Reporting bugs
 
-1~ Reporting bugs
+1~bugs Reporting bugs
 
 Debian Live is far from being perfect, but we want to make it as close as
 possible to perfect - with your help. Do not hesitate to report a bug: it is
@@ -12,30 +12,30 @@ For the impatient:
 _* Always check first the image status updates on our homepage at
 http://live.debian.net/ for known issues.
 
-_* Always try to reproduce the bug with the *{most recent version}* of
-live-helper and live-initramfs before submitting a bug report.
+_* Always try to reproduce the bug with the *{most recent versions}* of
+live-build, live-boot, and live-config before submitting a bug report.
 
 _* Try to give *{as specific information as possible}* about the bug. This
-includes (at least) the version of live-helper and live-initramfs used and
-the distribution of the live system you are building.
+includes (at least) the version of live-build, live-boot, and live-config
+used and the distribution of the live system you are building.
 
 2~ Known issues
 
-Due to the nature of Debian testing and Debian unstable branches being a
-moving target, building a live system may not always be possible.
+Due to the nature of Debian testing and Debian unstable distributions being
+a moving target, building a live system may not always be possible.
 
 If this is a problem, do not build a system based on testing or unstable,
-but go with stable. live-helper does always default to the current stable
+but go with stable. live-build does always default to the current stable
 release.
 
 Currently known issues are listed under the section 'status' on our homepage
 at http://live.debian.net/
 
 It is out of the scope of this manual to train you in correctly identifying
-and fixing problems in packages of the development branches, however, there
-are two things you can always try: When not succeeding to build testing, try
-if unstable works. If unstable does not work either, revert to testing and
-pinning the newer version of the failing package from unstable.
+and fixing problems in packages of the development distributions, however,
+there are two things you can always try: When not succeeding to build
+testing, try if unstable works. If unstable does not work either, revert to
+testing and pinning the newer version of the failing package from unstable.
 
 2~ Rebuild from scratch
 
@@ -46,15 +46,12 @@ is reproducible.
 2~ Use up-to-date packages
 
 Using outdated packages can cause significant problems when trying to
-reproduce (and ultimately fix) your problem. If a relevant package is not
-available in Debian anymore, please recognize that the resources of the
-Debian kernel team are limited and will be unlikely to be able to fix the
-problem.
+reproduce (and ultimately fix) your problem.
 
-2~ Collect information
+2~collect-information Collect information
 
 Please provide enough information with your report. At a minimum, it should
-contain the exact version of live-helper version where the bug is
+contain the exact version of live-build version where the bug is
 encountered, and steps to reproduce it. Please use common sense and include
 other relevant information if you think that it might help in solving the
 problem.
@@ -64,9 +61,11 @@ information:
 
 _* Architecture of the host system
 
-_* Version of live-helper on the host system
+_* Version of live-build on the host system
+
+_* Version of live-boot on the live system
 
-_* Version of live-initramfs on the live system
+_* Version of live-config on the live system
 
 _* Version of debootstrap and/or cdebootstrap on the host system
 
@@ -78,7 +77,11 @@ _* Version of the kernel on the live system
 
 You can generate a log of the build process by using the tee command:
 
-% code{ % % lh_build 2>&1 | tee buildlog.txt % % }code
+code{
+
+lb build 2>&1 | tee build.log
+
+}code
 
 Additionally, to rule out other errors, it is always a good idea to tar up
 your config directory and upload it somewhere (do *{not}* send it as an
@@ -86,7 +89,7 @@ attachment to the mailinglist), so that we can try to reproduce the errors
 you encountered.
 
 Remember to send in any logs that were produced with English locale
-settings, e.g. run your live-helper commands with a leading #{LC_ALL=C}# or
+settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or
 #{LC_ALL=en_US}#.
 
 2~ Use the correct package to report the bug against
@@ -95,26 +98,26 @@ Where does the bug appear?
 
 3~ At build time whilst bootstrapping
 
-live-helper first bootstraps a basic Debian system with #{debootstrap}# or
+live-build first bootstraps a basic Debian system with #{debootstrap}# or
 #{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian
 distribution it is bootstrapping, it may fail. If a bug appears here, check
 if the error is related to a specific Debian package (most likely), or if it
-is related to cdebootstrap itself.
+is related to bootstrapping tool itself.
 
 In both cases, this is not a bug in Debian Live, but rather in Debian itself
-which we can not fix this directly. Please report such a bug against
-#{debootstrap}#, #{cdebootstrap}# or the failing package.
+which we can not fix this directly. Please report such a bug against the
+bootstrapping tool or the failing package.
 
 3~ At build time whilst installing packages
 
-live-helper installs additional packages from the Debian archive and
+live-build installs additional packages from the Debian archive and
 depending on the Debian distribution used and the daily archive state, it
 can fail. If a bug appears here, check if the error is also reproducible on
 a normal system.
 
 If this is the case, this is not a bug in Debian Live, but rather in Debian
 - please report it against the failing package. Running debootstrap
-seperately from the Live system build or running lh_bootstrap with
+seperately from the Live system build or running lb bootstrap with
 #{--debug}# will give you more information.
 
 Also, if you are using a local mirror and/or any of sort of proxy and you
@@ -124,11 +127,12 @@ bootstrapping from an official mirror.
 3~ At boot-time
 
 If your image does not boot, please report it to the mailing list together
-with the information requested in collect-information. Do not forget to
-mention, how/when the image failed, in Qemu, VMWare or real hardware. If you
-are using a virtualization technology of any kind, please always run it on
-real hardware before reporting a bug. Providing a screenshot of the failure
-is also very helpful.  % FIXME: <xref linkend="collect-information"/>
+with the information requested in {Collect
+information}#collect-information. Do not forget to mention, how/when the
+image failed, in Qemu, VMWare or real hardware. If you are using a
+virtualization technology of any kind, please always run it on real hardware
+before reporting a bug. Providing a screenshot of the failure is also very
+helpful.
 
 3~ At run-time
 
@@ -148,9 +152,9 @@ as the homepage, as these are likely to contain the most up-to-date
 information. If such information exists, always include the references to it
 in your bug report.
 
-In addition, you should check the current bug list for live-helper and the
-current bug list for live-initramfs at to see whether something similar has
-been reported already.
+In addition, you should check the current bug lists for live-build,
+live-boot, and live-config to see whether something similar has been
+reported already.
 
 2~ Where to report bugs
 
@@ -159,13 +163,12 @@ System (BTS). For information on how to use the system, please see
 http://bugs.debian.org/. You can also submit the bugs by using the
 #{reportbug}# command from the package with the same name.
 
-In general, you should report build time errors against the live-helper
-package and run time errors against live-initramfs. If you are unsure of
-which package is appropriate or need more help before submitting a bug
-report, please send a message to the mailing list and we will help you to
-figure it out.
+In general, you should report build time errors against the live-build
+package, boot time errors against live-boot, and run time errors against
+live-config. If you are unsure of which package is appropriate or need more
+help before submitting a bug report, please send a message to the mailing
+list and we will help you to figure it out.
 
 Please note that bugs found in distributions derived from Debian (such as
-Ubuntu, Knoppix, Xandros, etc.) should *{not}* be reported to the Debian BTS
-unless they can be also reproduced on a Debian system using official Debian
-packages.
+Ubuntu and others) should *{not}* be reported to the Debian BTS unless they
+can be also reproduced on a Debian system using official Debian packages.
diff --git a/manual/de/user_basics.ssi b/manual/ro/user_basics.ssi
similarity index 93%
copy from manual/de/user_basics.ssi
copy to manual/ro/user_basics.ssi
index f9b0843..aef09b7 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -10,9 +10,7 @@ containing instructions on how to boot the various binary image types.
 A live system usually means an operating system booted on a computer from a
 removable medium (such as CD-ROM, USB stick, or network), ready to use
 without any installation on the usual drive(s), with an auto-configuration
-done at runtime (see terms).
-
-% FIXME: <xref linkend="terms"/>
+done at runtime (see {Terms}#terms ).
 
 With Debian Live, it's a Debian GNU/Linux operating system, built for one of
 the supported architectures (currently amd64, i386, powerpc and sparc). It
@@ -26,8 +24,8 @@ _* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
 containing modules possibly needed to mount the filesystem's image and some
 scripts to do it.
 
-_* *{System image}*: The operating systems filesystem image. Debian Live
-uses SquashFS, a compressed filesystem, to minimize its image size. Note
+_* *{System image}*: The operating systems filesystem image. The SquashFS
+compressed filesystem is used to minimize the Debian Live image size. Note
 that it's read-only. So, during boot the Debian Live system will use a RAM
 disk and 'union' mechanism to enable writing files within the running
 system. However, all modifications will be lost upon shutdown unless
@@ -65,9 +63,7 @@ $ lb config
 }code
 
 By passing no parameters to #{lb config}# we indicated that we wish to use
-the defaults (see lb-config).
-
-% FIXME: <xref linkend="lb-config"/>
+the defaults (see {The lb config command}#lb-config ).
 
 Now that we have a "config/" hierarchy, we may build the image with the lb
 build command:
@@ -79,9 +75,7 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network
-connection (see lb-build).
-
-% FIXME: <xref linkend="lb-build"/>
+connection (see {The lb build command}#lb-build ).
 
 3~ Testing an ISO image with Qemu
 
@@ -111,6 +105,19 @@ build the required kernel modules to run virtualbox-ose.
 After successful installation, virtualbox can be e.g. found in the GNOME
 menu under 'Applications/System Tools/VirtualBox OSE'.
 
+Please consider including of following packages onto the live image to
+achieve higher resolution of the display when booting the live image in
+virutalbox-ose (1280x1024 instead of 800x600 and in particular if the
+default resolution of the virtualbox-ose display shouldn't work with the
+gui-installer).
+
+code{
+
+virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
+virtualbox-ose-guest-x11
+
+}code
+
 3~ Burning an ISO image to a physical medium
 
 Burning an ISO image is easy:
@@ -131,9 +138,8 @@ booting from USB sticks, USB hard drives, and various other portable storage
 devices.
 
 Note if you created an iso image with the previous example, you will need to
-clean up your working directory with the #{lb clean} command (see lb-clean):
-
-% FIXME: <xref linkend="lb-clean"/>
+clean up your working directory with the #{lb clean} command (see {The lb
+clean command}#lb-clean ):
 
 code{
 
@@ -321,7 +327,7 @@ code{
 
 dpkg-reconfigure -plow tftpd-hpa
 
-code}
+}code
 
 and fill in the new tftp server directory when being asked about it.
 
diff --git a/manual/de/user_customization-contents.ssi b/manual/ro/user_customization-contents.ssi
similarity index 96%
copy from manual/de/user_customization-contents.ssi
copy to manual/ro/user_customization-contents.ssi
index 7c43045..df28e53 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/ro/user_customization-contents.ssi
@@ -1,8 +1,8 @@
-B~ Customising contents
+B~ Customizing contents
 
-1~ Customising contents
+1~customizing-contents Customizing contents
 
-This chapter discusses further customisation of the live system.
+This chapter discusses further customization of the live system.
 
 2~ Includes
 
diff --git a/manual/ro/user_customization-internationalization.ssi b/manual/ro/user_customization-internationalization.ssi
new file mode 100644
index 0000000..beb134a
--- /dev/null
+++ b/manual/ro/user_customization-internationalization.ssi
@@ -0,0 +1,49 @@
+B~ Customizing locale and language
+
+1~customizing-locale-and-language Customizing locale and language
+
+2~ Default locale and keyboard
+
+The default locale when building a live cd is "locales=en_US.UTF-8", to set
+the locale for e.g. Switzerland, you can use "locales=de_CH.UTF-8".
+
+code{
+
+$ lb config --bootappend-live "locales=de_CH.UTF-8"
+
+}code
+
+The entry for a Swiss-German keyboard would be:
+
+code{
+
+$ lb config --bootappend-live "keyboard-layouts=ch"
+
+}code
+
+Combined, the keyboard and locale configured for Switzerland would be:
+
+code{
+
+$ lb config --bootappend-live ="locales=de_CH.UTF-8 keyboard-layouts=ch"
+
+}code
+
+Note: You can find a list of options in the manpage for
+live-config. Currently, only UTF-8 locales are supported.
+
+2~ l10n Packages
+
+An experimental feature of live-build is to automatically check for each
+package for which it is know that there are -l10n packages available and
+install them. To add German packages the entry would be
+
+code{
+
+$ lb config --language "de"
+
+}code
+
+This will also change the default syslinux language if translations are
+available or local translations have been put into
+#{config/templates/syslinux/de}#.
diff --git a/manual/ro/user_customization-overview.ssi b/manual/ro/user_customization-overview.ssi
new file mode 100644
index 0000000..517ca3d
--- /dev/null
+++ b/manual/ro/user_customization-overview.ssi
@@ -0,0 +1,13 @@
+B~ Customizing contents
+
+1~customization-overview Customization overview
+
+% FIXME: just a stub for now.  In conversational style, cover the different
+kinds of customization % and link to each section within the text.
+
+This chapter gives an overview of the various ways in which your Debian live
+systems may be customized. See sections {Customizing package
+installation}#customizing-package-installation, {Customizing
+contents}#customizing-contents and {Customizing locale and
+language}#customizing-locale-and-language.
+
diff --git a/manual/de/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
similarity index 93%
copy from manual/de/user_customization-packages.ssi
copy to manual/ro/user_customization-packages.ssi
index b848d7f..29fb5eb 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -1,6 +1,6 @@
-:B~ Customising package installation
+:B~ Customizing package installation
 
-1~ Customising package installation
+1~customizing-package-installation Customizing package installation
 
 _* Selecting additional packages to be installed
 
@@ -174,6 +174,17 @@ in order to be processed. Local packages lists always override package lists
 distributed with live-build. This can cause undesired effects, we therefore
 recommend to use unique names for local packages lists.
 
+*{Local binary packages lists}*
+
+In case you want to include some required .deb packages to live media's
+pool/ (without installing them onto the live image) you may need to use
+lists using binary local package lists stored in
+#{config/binary_local-packageslists}#. Such media can be used as a
+customized debian install image for offline installations.
+
+Package lists that exist in this directory need to have a .list suffix in
+order to be processed.
+
 *{Extending a provided package list using includes}*
 
 % FIXME
@@ -248,7 +259,7 @@ _* #{chroot_local-packages}#
 _* Using a custom APT repository
 
 The #{chroot_local-packages}# is simpler to achieve and useful for "one-off"
-customisations but has a number of drawbacks, whilst using a custom APT
+customizations but has a number of drawbacks, whilst using a custom APT
 repository is more time-consuming to set up.
 
 3~ Using #{chroot_local-packages}# to install custom packages
diff --git a/manual/de/user_installation.ssi b/manual/ro/user_installation.ssi
similarity index 90%
copy from manual/de/user_installation.ssi
copy to manual/ro/user_installation.ssi
index d330950..9869ff4 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/ro/user_installation.ssi
@@ -84,7 +84,9 @@ and uninstall it with:
 
 code{
 
-# make uninstall }code
+# make uninstall
+
+}code
 
 3~ From 'snapshots'
 
@@ -94,14 +96,12 @@ are available on http://live.debian.net/debian/.
 
 2~ live-boot
 
-*{Note:}* You do not need to install live-boot on your system to create customised Debian Live systems. However, doing so will do no harm.
+*{Note:}* You do not need to install live-boot on your system to create customized Debian Live systems. However, doing so will do no harm.
 
-3~ Using a customised live-boot
+3~ Using a customized live-boot
 
 To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in terms.
-
-% FIXME: <xref linkend="terms"/>
+familiar with the terms mentioned in {Terms}#terms .
 
 _* Checkout the live-boot source
 
@@ -120,8 +120,8 @@ should name it without dashes '-', e.g: call it "99new_feature" and not
 _* Build a live-boot .deb
 
 You must build either on your target distribution or in a chroot containing
-your target platform: this means if your target is squeeze then you should
-build against squeeze. You can use a personal builder such as /{pbuilder}/
+your target platform: this means if your target is Squeeze then you should
+build against Squeeze. You can use a personal builder such as /{pbuilder}/
 or /{sbuild}/ to automate building packages in chroot. To build directly on
 the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/
 package):
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
new file mode 100644
index 0000000..3047ef0
--- /dev/null
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -0,0 +1,83 @@
+:B~ Managing a configuration
+
+1~ Managing a configuration
+
+This chapter explains how to manage a live configuration from initial
+creation, through successive revisions and successive releases of both the
+live-build software and the live image itself.
+
+2~ Use auto to manage configuration changes
+
+Live configurations rarely are perfect on the first try. You'll likely need
+to make a series of revisions until you are satisfied. However,
+inconsistencies can creep into your configuration from one revision to the
+next if you aren't careful. The main problem is, once a variable is given a
+default value, that value will not be recomputed from other variables that
+may change in later revisions.
+
+For example, when the distribution is first set, many 'dependent' variables
+are given default values that suit that distribution. However, if you later
+decide to change the distribution, those dependent variables continue to
+retain old values that are no longer appropriate.
+
+A second, related problem is that if you run #{lb config}# and then upgrade
+to a new version of live-build that has changed one of the variable names,
+you will discover this only by manual review of the variables in your config
+files, which you will then need to use to set the appropriate option again.
+
+All of this would be a terrible nuisance if it weren't for auto/* scripts,
+simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
+that are designed to help you manage your configuration. Simply create an
+auto/config script containing #{lb config}# command with all desired
+options, and an auto/clean that removes the files containing configuration
+variable values, and each time you #{lb config}# and #{lb clean}#, these
+files will be executed. This will ensure that your configuration is kept
+internally consistent from one revision to the next and from one live-build
+release to the next (though you will still have to take care and read the
+documentation when you upgrade live-build and make adjustments as needed).
+
+2~ Example auto scripts
+
+Use the following auto script examples as the starting point for your new
+live-build configuration. Take note that when you call the #{lb}# command
+that the auto script wraps, you must specify #{noauto}# as its parameter to
+ensure that the auto script isn't called again, recursively.
+
+auto/config
+
+code{
+
+#!/bin/sh
+lb config noauto \
+	--architecture i386 \
+	${@}
+
+}code
+
+auto/clean
+
+code{
+
+#!/bin/sh
+lb clean noauto ${@}
+rm -f config/binary config/bootstrap \
+	config/chroot config/common config/source
+rm -f binary.log
+
+}code
+
+auto/build
+
+code{
+
+#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log
+
+}code
+
+Edit auto/config, changing or adding any options as you see fit. In the
+example above, --architecture is set to i386 so that when the image is built
+on an amd64 system, it will not default to building amd64 images. Change
+this to an appropriate value for your image (or delete it if you want to use
+the default) and add any additional options in continuation lines that
+follow.
+
diff --git a/manual/de/user_overview.ssi b/manual/ro/user_overview.ssi
similarity index 84%
copy from manual/de/user_overview.ssi
copy to manual/ro/user_overview.ssi
index 49fdf79..9c7e8ff 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -2,10 +2,10 @@
 
 1~ Overview of tools
 
-This chapter contains an overview of the two main tools used in building
-Debian Live systems.
+This chapter contains an overview of the three main tools used in building
+Debian Live systems: live-build, live-boot and live-config.
 
-2~ live-build
+2~live-build live-build
 
 live-build is a collection of scripts to build Debian Live systems. These
 scripts are also referred to as "commands".
@@ -30,9 +30,7 @@ each command.
 Unlike debhelper, live-build contains a tool to generate a skeleton
 configuration directory, #{lb config}#. This could be considered to be
 similar to tools such as #{dh-make}#. For more information about #{lb
-config}#, please see lb-config.
-
-% FIXME: <xref linkend="lb-config"/>
+config}#, please see {The lb config command}#lb-config.
 
 Besides the common config/common, which is used by all live-build commands,
 some additional files can be used to configure the behavior of specific
@@ -65,35 +63,24 @@ dpkg --print-architecture and "dist" is the same as the codename of the
 target distribution), then they will be used in preference to the other,
 more general files.
 
-Please see installation for information on how to install live-build.
-
-% FIXME: <xref linkend="installation"/>
-
 The remainder of this section discusses the three most important commands:
 
-_* *{lb config}*: Responsible for initialising a Live system configuration
-directory. See lb-config for more information.
-
-% FIXME: <xref linkend="lb-config"/>
-
-_* *{lb build}*: Responsible for starting a Live system build. See lb-build
-for more information.
+_* *{lb config}*: Responsible for initializing a Live system configuration
+directory. See {The lb config command}#lb-config for more information.
 
-% FIXME: <xref linkend="lb-build"/>
+_* *{lb build}*: Responsible for starting a Live system build. See {The lb
+build command}#lb-build for more information.
 
 _* *{lb clean}*: Responsible for removing parts of a Live system build. See
-lb-clean for more information.
+{The lb clean command}#lb-clean for more information.
 
-% FIXME: <xref linkend="lb-clean"/
+3~lb-config The #{lb config}# command
 
-3~ The #{lb config}# command
-
-As discussed in live-build, the scripts that make up live-build source their
-configuration from a single directory named config/. As constructing this
-directory by hand would be time-consuming and error-prone, the #{lb config}#
-command can be used to create skeleton configuration folders.
-
-% FIXME: <xref linkend="live-build"/>
+As discussed in {live-build}#live-build, the scripts that make up live-build
+source their configuration from a single directory named config/. As
+constructing this directory by hand would be time-consuming and error-prone,
+the #{lb config}# command can be used to create skeleton configuration
+folders.
 
 Issuing #{lb config}# without any arguments creates a config subdirectory
 which it populates with some default settings:
@@ -156,18 +143,18 @@ $ lb config --binary-images net --hostname live-machine --username live-user
 A full list of options is available in the #{lb_config}# man page. Most
 options have a parallel with an "LB_" prefixed variable.
 
-3~ The #{lb build}# command
+3~lb-build The #{lb build}# command
 
 The #{lb build}# command reads in your configuration from the config/
 directory. It then runs the lower lower level commands needed to build your
 Live system.
 
-3~ The #{lb clean}# command
+3~lb-clean The #{lb clean}# command
 
 It is the job of the #{lb clean}# command to remove various parts of a build
 so subsequent builds can start from a clean state.
 
-2~ The live-boot package
+2~live-boot The live-boot package
 
 live-boot is a collection of scripts providing hooks for the
 initramfs-tools, used to generate an initramfs capable of booting live
@@ -182,3 +169,11 @@ Debian like systems to boot from.
 More information on initial ramfs in Debian can be found in the Debian Linux
 Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter
 on initramfs.
+
+2~live-config The live-config package
+
+live-config consists of the scripts that run at boot time after live-boot to
+configure the live system automatically. It handles such tasks as setting
+the hostname, locales and timezone, creating the live user, inhibiting cron
+jobs and performing autologin of the live user.
+

-- 
live-manual



More information about the debian-live-changes mailing list