[SCM] live-manual branch, debian, updated. debian/2.0_a11-1-5-g89b5ce4
Daniel Baumann
daniel at debian.org
Tue Nov 30 09:56:43 UTC 2010
The following commit has been merged in the debian branch:
commit 89b5ce4a1d3cc5d05a52668c1528f991040260e7
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Nov 30 10:56:21 2010 +0100
Splitting out installer stuff from other__common-tasks to own page as user_customization-installer.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index f50bd2e..6803d68 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -45,6 +45,8 @@
<< user_customization-internationalization.ssi
+<< user_customization-installer.ssi
+
:B~ Development ~#
:B~ Project ~#
diff --git a/manual/de/other_common-tasks.ssi b/manual/de/other_common-tasks.ssi
index 98cb5d7..d9832a3 100644
--- a/manual/de/other_common-tasks.ssi
+++ b/manual/de/other_common-tasks.ssi
@@ -2,70 +2,6 @@ B~ Common tasks
1~ Common tasks
-2~ The Debian Installer
-
-Although Debian Live is mostly concerned with avoiding permanent
-installation, integrating some form of installer to your image is
-possible. There are number of different "types" of installation, varying in
-what and how to install the image.
-
-Please note the careful use of capital letters when referring to the "Debian
-Installer" in this section - when used like this we refer explicitly to the
-official installer for the Debian system, not anything else. It is often
-seen abbreviated to "d-i".
-
-The three main types of installer are:
-
-_* *{"Normal" Debian Installer}*: This is a normal Debian Live image with a
-seperate kernel and initrd which (when selected from the appropriate
-bootloader) launches into a standard Debian Installer instance, just as if
-you had downloaded a CD image of Debian and booted it.
-
-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 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.
-
-Installation will proceed in an identical fashion to the "Normal"
-installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the "live"
-filesystem image is copied to the target. After this stage, the Debian
-Installer continues as normal, installing and configuring items such as
-bootloaders and local users, etc.
-
-This is working now.
-
-_* *{"Ubuntu"-style installer}*: This is where you boot into a graphical
-Debian Live system and run a wizard-based program which installs and
-configures the live system, all the time remaining inside the live graphical
-environment.
-
-This is currently NOT possible with Debian Live.
-
-By default, no installer will be included in the Debian Live image. You can
-enable it by using #{lh_config}#:
-
-code{
-
-$ lh_config --help ... [--debian-installer
-enabled|cdrom|netinst|netboot|businesscard|live|disabled]
-[--debian-installer-distribution CODENAME|daily]
-[--debian-installer-preseedfile FILE|URL] ...
-
-}code
-
-The values "Normal", "Live" and "Ubuntu" are not valid values for
-#{LH_BINARY_DEBIAN_INSTALLER}#. Refer to the output of #{lh_config}# cited
-above to choose the appropriate values.
-
2~ WiFi Connection
Depending on the Debian Live image you are using and the given tools
diff --git a/manual/de/user_customization-installer.ssi b/manual/de/user_customization-installer.ssi
new file mode 100644
index 0000000..fcb326a
--- /dev/null
+++ b/manual/de/user_customization-installer.ssi
@@ -0,0 +1,54 @@
+:B~ Customizing Debian Installer
+
+1~customizing-installer Customizing Debian Installer
+
+Debian Live system images can be integrated with Debian Installer. There are
+number of different "types" of installation, varying in what and how to
+install the image.
+
+Please note the careful use of capital letters when referring to the "Debian
+Installer" in this section - when used like this we refer explicitly to the
+official installer for the Debian system, not anything else. It is often
+seen abbreviated to "d-i".
+
+The three main types of installer are:
+
+_* *{"Regular" Debian Installer}*: This is a normal Debian Live image with a
+seperate kernel and initrd which (when selected from the appropriate
+bootloader) launches into a standard Debian Installer instance, just as if
+you had downloaded a CD image of Debian and booted it. Images containing a
+live system and such an otherwise indepentend installer are often referet to
+as "combined images".
+
+On such images, Debian is installed by fetching and installing .deb 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 customized in a number of ways; see
+the relevant pages in the Debian Installer manual for more information. Once
+you have a working preseeding file, live-build can automatically place it to
+the image and enable it for you.
+
+_* *{"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.
+
+Installation will proceed in an identical fashion to the "Regular"
+installation described above, but at the actual package installation stage,
+instead of using #{debootstrap}# to fetch and install packages, the "live"
+filesystem image is copied to the target. This is acchieved with a special
+udeb called live-installer. live-installer can be preseeded to be disabled,
+allowing to support normal and live installer entries in the bootloader of
+the same live media.
+
+After this stage, the Debian Installer continues as normal, installing and
+configuring items such as bootloaders and local users, etc.
+
+_* *{"Desktop" Debian Installer}*: Regardless of the mode Debian Installer
+is used in, d-i can be launched from the Desktop by clicking on an
+icon. This is user friendlier in some situations. In order to make use of
+this, the debian-installer-launcher package needs to be included.
+
+Note that by default live-build does not include Debian Installer images in
+the images, it needs to be specifically enabled with lb config.
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 1fbb3d4..7970eec 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -45,6 +45,8 @@
<< user_customization-internationalization.ssi
+<< user_customization-installer.ssi
+
:B~ Development ~#
:B~ Project ~#
diff --git a/manual/en/other_common-tasks.ssi b/manual/en/other_common-tasks.ssi
index 106ec26..9c9980c 100644
--- a/manual/en/other_common-tasks.ssi
+++ b/manual/en/other_common-tasks.ssi
@@ -2,40 +2,6 @@ B~ Common tasks
1~ Common tasks
-2~ The Debian Installer
-
-Although Debian Live is mostly concerned with avoiding permanent installation, integrating some form of installer to your image is possible. There are number of different "types" of installation, varying in what and how to install the image.
-
-Please note the careful use of capital letters when referring to the "Debian Installer" in this section - when used like this we refer explicitly to the official installer for the Debian system, not anything else. It is often seen abbreviated to "d-i".
-
-The three main types of installer are:
-
-_* *{"Normal" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it.
-
-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 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.
-
-Installation will proceed in an identical fashion to the "Normal" installation described above, but at the actual package installation stage, instead of using #{debootstrap}# to fetch and install packages, the "live" filesystem image is copied to the target. After this stage, the Debian Installer continues as normal, installing and configuring items such as bootloaders and local users, etc.
-
-This is working now.
-
-_* *{"Ubuntu"-style installer}*: This is where you boot into a graphical Debian Live system and run a wizard-based program which installs and configures the live system, all the time remaining inside the live graphical environment.
-
-This is currently NOT possible with Debian Live.
-
-By default, no installer will be included in the Debian Live image. You can enable it by using #{lh_config}#:
-
-code{
-
-$ lh_config --help ... [--debian-installer enabled|cdrom|netinst|netboot|businesscard|live|disabled] [--debian-installer-distribution CODENAME|daily] [--debian-installer-preseedfile FILE|URL] ...
-
-}code
-
-The values "Normal", "Live" and "Ubuntu" are not valid values for #{LH_BINARY_DEBIAN_INSTALLER}#. Refer to the output of #{lh_config}# cited above to choose the appropriate values.
-
2~ WiFi Connection
Depending on the Debian Live image you are using and the given tools configured with your Debian Live image you may need to only attach to an available access point. If you encounter difficulty a good place to start is at the Debian Wiki entry at http://wiki.debian.org/WiFi.
diff --git a/manual/en/user_customization-installer.ssi b/manual/en/user_customization-installer.ssi
new file mode 100644
index 0000000..877ced9
--- /dev/null
+++ b/manual/en/user_customization-installer.ssi
@@ -0,0 +1,25 @@
+:B~ Customizing Debian Installer
+
+1~customizing-installer Customizing Debian Installer
+
+Debian Live system images can be integrated with Debian Installer. There are number of different "types" of installation, varying in what and how to install the image.
+
+Please note the careful use of capital letters when referring to the "Debian Installer" in this section - when used like this we refer explicitly to the official installer for the Debian system, not anything else. It is often seen abbreviated to "d-i".
+
+The three main types of installer are:
+
+_* *{"Regular" Debian Installer}*: This is a normal Debian Live image with a seperate kernel and initrd which (when selected from the appropriate bootloader) launches into a standard Debian Installer instance, just as if you had downloaded a CD image of Debian and booted it. Images containing a live system and such an otherwise indepentend installer are often referet to as "combined images".
+
+On such images, Debian is installed by fetching and installing .deb 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 customized in a number of ways; see the relevant pages in the Debian Installer manual for more information. Once you have a working preseeding file, live-build can automatically place it to the image and enable it for you.
+
+_* *{"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.
+
+Installation will proceed in an identical fashion to the "Regular" installation described above, but at the actual package installation stage, instead of using #{debootstrap}# to fetch and install packages, the "live" filesystem image is copied to the target. This is acchieved with a special udeb called live-installer. live-installer can be preseeded to be disabled, allowing to support normal and live installer entries in the bootloader of the same live media.
+
+After this stage, the Debian Installer continues as normal, installing and configuring items such as bootloaders and local users, etc.
+
+_* *{"Desktop" Debian Installer}*: Regardless of the mode Debian Installer is used in, d-i can be launched from the Desktop by clicking on an icon. This is user friendlier in some situations. In order to make use of this, the debian-installer-launcher package needs to be included.
+
+Note that by default live-build does not include Debian Installer images in the images, it needs to be specifically enabled with lb config.
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 2db800f..cfda310 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -45,6 +45,8 @@
<< user_customization-internationalization.ssi
+<< user_customization-installer.ssi
+
:B~ Development ~#
:B~ Project ~#
diff --git a/manual/fr/other_common-tasks.ssi b/manual/fr/other_common-tasks.ssi
index 98cb5d7..d9832a3 100644
--- a/manual/fr/other_common-tasks.ssi
+++ b/manual/fr/other_common-tasks.ssi
@@ -2,70 +2,6 @@ B~ Common tasks
1~ Common tasks
-2~ The Debian Installer
-
-Although Debian Live is mostly concerned with avoiding permanent
-installation, integrating some form of installer to your image is
-possible. There are number of different "types" of installation, varying in
-what and how to install the image.
-
-Please note the careful use of capital letters when referring to the "Debian
-Installer" in this section - when used like this we refer explicitly to the
-official installer for the Debian system, not anything else. It is often
-seen abbreviated to "d-i".
-
-The three main types of installer are:
-
-_* *{"Normal" Debian Installer}*: This is a normal Debian Live image with a
-seperate kernel and initrd which (when selected from the appropriate
-bootloader) launches into a standard Debian Installer instance, just as if
-you had downloaded a CD image of Debian and booted it.
-
-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 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.
-
-Installation will proceed in an identical fashion to the "Normal"
-installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the "live"
-filesystem image is copied to the target. After this stage, the Debian
-Installer continues as normal, installing and configuring items such as
-bootloaders and local users, etc.
-
-This is working now.
-
-_* *{"Ubuntu"-style installer}*: This is where you boot into a graphical
-Debian Live system and run a wizard-based program which installs and
-configures the live system, all the time remaining inside the live graphical
-environment.
-
-This is currently NOT possible with Debian Live.
-
-By default, no installer will be included in the Debian Live image. You can
-enable it by using #{lh_config}#:
-
-code{
-
-$ lh_config --help ... [--debian-installer
-enabled|cdrom|netinst|netboot|businesscard|live|disabled]
-[--debian-installer-distribution CODENAME|daily]
-[--debian-installer-preseedfile FILE|URL] ...
-
-}code
-
-The values "Normal", "Live" and "Ubuntu" are not valid values for
-#{LH_BINARY_DEBIAN_INSTALLER}#. Refer to the output of #{lh_config}# cited
-above to choose the appropriate values.
-
2~ WiFi Connection
Depending on the Debian Live image you are using and the given tools
diff --git a/manual/fr/user_customization-installer.ssi b/manual/fr/user_customization-installer.ssi
new file mode 100644
index 0000000..fcb326a
--- /dev/null
+++ b/manual/fr/user_customization-installer.ssi
@@ -0,0 +1,54 @@
+:B~ Customizing Debian Installer
+
+1~customizing-installer Customizing Debian Installer
+
+Debian Live system images can be integrated with Debian Installer. There are
+number of different "types" of installation, varying in what and how to
+install the image.
+
+Please note the careful use of capital letters when referring to the "Debian
+Installer" in this section - when used like this we refer explicitly to the
+official installer for the Debian system, not anything else. It is often
+seen abbreviated to "d-i".
+
+The three main types of installer are:
+
+_* *{"Regular" Debian Installer}*: This is a normal Debian Live image with a
+seperate kernel and initrd which (when selected from the appropriate
+bootloader) launches into a standard Debian Installer instance, just as if
+you had downloaded a CD image of Debian and booted it. Images containing a
+live system and such an otherwise indepentend installer are often referet to
+as "combined images".
+
+On such images, Debian is installed by fetching and installing .deb 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 customized in a number of ways; see
+the relevant pages in the Debian Installer manual for more information. Once
+you have a working preseeding file, live-build can automatically place it to
+the image and enable it for you.
+
+_* *{"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.
+
+Installation will proceed in an identical fashion to the "Regular"
+installation described above, but at the actual package installation stage,
+instead of using #{debootstrap}# to fetch and install packages, the "live"
+filesystem image is copied to the target. This is acchieved with a special
+udeb called live-installer. live-installer can be preseeded to be disabled,
+allowing to support normal and live installer entries in the bootloader of
+the same live media.
+
+After this stage, the Debian Installer continues as normal, installing and
+configuring items such as bootloaders and local users, etc.
+
+_* *{"Desktop" Debian Installer}*: Regardless of the mode Debian Installer
+is used in, d-i can be launched from the Desktop by clicking on an
+icon. This is user friendlier in some situations. In order to make use of
+this, the debian-installer-launcher package needs to be included.
+
+Note that by default live-build does not include Debian Installer images in
+the images, it needs to be specifically enabled with lb config.
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 4986587..2d7c277 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-11-30 10:39+0100\n"
+"POT-Creation-Date: 2010-11-30 10:53+0100\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -131,41 +131,46 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:49
-msgid ":B~ Development ~#"
+msgid "<< user_customization-installer.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:51
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:53
-msgid "<< project_bugs.ssi"
+msgid ":B~ Project ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:55
-msgid "<< project_procedures.ssi"
+msgid "<< project_bugs.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:57
-msgid ":B~ Examples ~#"
+msgid "<< project_procedures.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:59
-msgid "<< user_examples.ssi"
+msgid ":B~ Examples ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:61
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:63
msgid ":B~ Other ~#"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:69
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 "
@@ -175,51 +180,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:71
msgid "% << other_customization-bootup.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:71
+#: en/live-manual.ssm:73
msgid "% << other_customization-binary.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:75
msgid "% << other_common-tasks.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:77
msgid "% << other_live-environment.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:79
msgid "% << other_faq.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:81
msgid "% << other_howtos.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:81
+#: en/live-manual.ssm:83
msgid "% << other_coding-style.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:83
+#: en/live-manual.ssm:85
msgid "% << other_resources.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:85
+#: en/live-manual.ssm:87
msgid "% << other_configuration-layout.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:86
+#: en/live-manual.ssm:88
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 e176937..242b777 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-16 14:45-0200\n"
+"POT-Creation-Date: 2010-11-30 10:53+0100\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,126 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: 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_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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: 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_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: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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
#: en/other_common-tasks.ssi:2
msgid "B~ Common tasks"
msgstr ""
@@ -148,126 +28,11 @@ msgstr ""
#. type: Plain text
#: en/other_common-tasks.ssi:6
-msgid "2~ The Debian Installer"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:8
-msgid ""
-"Although Debian Live is mostly concerned with avoiding permanent "
-"installation, integrating some form of installer to your image is possible. "
-"There are number of different \"types\" of installation, varying in what and "
-"how to install the image."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:10
-msgid ""
-"Please note the careful use of capital letters when referring to the "
-"\"Debian Installer\" in this section - when used like this we refer "
-"explicitly to the official installer for the Debian system, not anything "
-"else. It is often seen abbreviated to \"d-i\"."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:12
-msgid "The three main types of installer are:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:14
-msgid ""
-"_* *{\"Normal\" Debian Installer}*: This is a normal Debian Live image with "
-"a seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into a standard Debian Installer instance, just as if "
-"you had downloaded a CD image of Debian and booted it."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:16
-msgid ""
-"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."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:18
-msgid ""
-"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 ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:20
-msgid ""
-"_* *{\"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."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:22
-msgid ""
-"Installation will proceed in an identical fashion to the \"Normal\" "
-"installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
-"filesystem image is copied to the target. After this stage, the Debian "
-"Installer continues as normal, installing and configuring items such as "
-"bootloaders and local users, etc."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:24
-msgid "This is working now."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:26
-msgid ""
-"_* *{\"Ubuntu\"-style installer}*: This is where you boot into a graphical "
-"Debian Live system and run a wizard-based program which installs and "
-"configures the live system, all the time remaining inside the live graphical "
-"environment."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:28
-msgid "This is currently NOT possible with Debian Live."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:30
-msgid ""
-"By default, no installer will be included in the Debian Live image. You can "
-"enable it by using #{lh_config}#:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:34
-msgid ""
-"$ lh_config --help ... [--debian-installer enabled|cdrom|netinst|netboot|"
-"businesscard|live|disabled] [--debian-installer-distribution CODENAME|daily] "
-"[--debian-installer-preseedfile FILE|URL] ..."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:38
-msgid ""
-"The values \"Normal\", \"Live\" and \"Ubuntu\" are not valid values for #"
-"{LH_BINARY_DEBIAN_INSTALLER}#. Refer to the output of #{lh_config}# cited "
-"above to choose the appropriate values."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:40
msgid "2~ WiFi Connection"
msgstr ""
#. type: Plain text
-#: en/other_common-tasks.ssi:41
+#: en/other_common-tasks.ssi:7
msgid ""
"Depending on the Debian Live image you are using and the given tools "
"configured with your Debian Live image you may need to only attach to an "
diff --git a/manual/po/de/user_customization-installer.ssi.po b/manual/po/de/user_customization-installer.ssi.po
new file mode 100644
index 0000000..a8ad424
--- /dev/null
+++ b/manual/po/de/user_customization-installer.ssi.po
@@ -0,0 +1,121 @@
+# 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-11-30 10:53+0100\n"
+"PO-Revision-Date: 2010-11-30 10:53+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:2
+msgid ":B~ Customizing Debian Installer"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:4
+msgid "1~customizing-installer Customizing Debian Installer"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:6
+msgid ""
+"Debian Live system images can be integrated with Debian Installer. There are "
+"number of different \"types\" of installation, varying in what and how to "
+"install the image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:8
+msgid ""
+"Please note the careful use of capital letters when referring to the "
+"\"Debian Installer\" in this section - when used like this we refer "
+"explicitly to the official installer for the Debian system, not anything "
+"else. It is often seen abbreviated to \"d-i\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:10
+msgid "The three main types of installer are:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:12
+msgid ""
+"_* *{\"Regular\" Debian Installer}*: This is a normal Debian Live image with "
+"a seperate kernel and initrd which (when selected from the appropriate "
+"bootloader) launches into a standard Debian Installer instance, just as if "
+"you had downloaded a CD image of Debian and booted it. Images containing a "
+"live system and such an otherwise indepentend installer are often referet to "
+"as \"combined images\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:14
+msgid ""
+"On such images, Debian is installed by fetching and installing .deb 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."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:16
+msgid ""
+"This whole process can be preseeded and customized in a number of ways; see "
+"the relevant pages in the Debian Installer manual for more information. Once "
+"you have a working preseeding file, live-build can automatically place it to "
+"the image and enable it for you."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:18
+msgid ""
+"_* *{\"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."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:20
+msgid ""
+"Installation will proceed in an identical fashion to the \"Regular\" "
+"installation described above, but at the actual package installation stage, "
+"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
+"filesystem image is copied to the target. This is acchieved with a special "
+"udeb called live-installer. live-installer can be preseeded to be disabled, "
+"allowing to support normal and live installer entries in the bootloader of "
+"the same live media."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:22
+msgid ""
+"After this stage, the Debian Installer continues as normal, installing and "
+"configuring items such as bootloaders and local users, etc."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:24
+msgid ""
+"_* *{\"Desktop\" Debian Installer}*: Regardless of the mode Debian Installer "
+"is used in, d-i can be launched from the Desktop by clicking on an icon. "
+"This is user friendlier in some situations. In order to make use of this, "
+"the debian-installer-launcher package needs to be included."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:25
+msgid ""
+"Note that by default live-build does not include Debian Installer images in "
+"the images, it needs to be specifically enabled with lb config."
+msgstr ""
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 075e3d4..4e1bf3d 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 10:39+0100\n"
+"POT-Creation-Date: 2010-11-30 10:53+0100\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -131,41 +131,46 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:49
-msgid ":B~ Development ~#"
+msgid "<< user_customization-installer.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:51
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:53
-msgid "<< project_bugs.ssi"
+msgid ":B~ Project ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:55
-msgid "<< project_procedures.ssi"
+msgid "<< project_bugs.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:57
-msgid ":B~ Examples ~#"
+msgid "<< project_procedures.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:59
-msgid "<< user_examples.ssi"
+msgid ":B~ Examples ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:61
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:63
msgid ":B~ Other ~#"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:69
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 "
@@ -175,51 +180,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:71
msgid "% << other_customization-bootup.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:71
+#: en/live-manual.ssm:73
msgid "% << other_customization-binary.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:75
msgid "% << other_common-tasks.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:77
msgid "% << other_live-environment.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:79
msgid "% << other_faq.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:81
msgid "% << other_howtos.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:81
+#: en/live-manual.ssm:83
msgid "% << other_coding-style.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:83
+#: en/live-manual.ssm:85
msgid "% << other_resources.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:85
+#: en/live-manual.ssm:87
msgid "% << other_configuration-layout.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:86
+#: en/live-manual.ssm:88
msgid "% << other_configuration-files.ssi"
msgstr ""
diff --git a/manual/po/fr/other_common-tasks.ssi.po b/manual/po/fr/other_common-tasks.ssi.po
index a2bbdb2..960b8a5 100644
--- a/manual/po/fr/other_common-tasks.ssi.po
+++ b/manual/po/fr/other_common-tasks.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"POT-Creation-Date: 2010-11-30 10:53+0100\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,126 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: 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_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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: 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_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: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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
#: en/other_common-tasks.ssi:2
msgid "B~ Common tasks"
msgstr ""
@@ -148,126 +28,11 @@ msgstr ""
#. type: Plain text
#: en/other_common-tasks.ssi:6
-msgid "2~ The Debian Installer"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:8
-msgid ""
-"Although Debian Live is mostly concerned with avoiding permanent "
-"installation, integrating some form of installer to your image is possible. "
-"There are number of different \"types\" of installation, varying in what and "
-"how to install the image."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:10
-msgid ""
-"Please note the careful use of capital letters when referring to the "
-"\"Debian Installer\" in this section - when used like this we refer "
-"explicitly to the official installer for the Debian system, not anything "
-"else. It is often seen abbreviated to \"d-i\"."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:12
-msgid "The three main types of installer are:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:14
-msgid ""
-"_* *{\"Normal\" Debian Installer}*: This is a normal Debian Live image with "
-"a seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into a standard Debian Installer instance, just as if "
-"you had downloaded a CD image of Debian and booted it."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:16
-msgid ""
-"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."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:18
-msgid ""
-"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 ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:20
-msgid ""
-"_* *{\"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."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:22
-msgid ""
-"Installation will proceed in an identical fashion to the \"Normal\" "
-"installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
-"filesystem image is copied to the target. After this stage, the Debian "
-"Installer continues as normal, installing and configuring items such as "
-"bootloaders and local users, etc."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:24
-msgid "This is working now."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:26
-msgid ""
-"_* *{\"Ubuntu\"-style installer}*: This is where you boot into a graphical "
-"Debian Live system and run a wizard-based program which installs and "
-"configures the live system, all the time remaining inside the live graphical "
-"environment."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:28
-msgid "This is currently NOT possible with Debian Live."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:30
-msgid ""
-"By default, no installer will be included in the Debian Live image. You can "
-"enable it by using #{lh_config}#:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:34
-msgid ""
-"$ lh_config --help ... [--debian-installer enabled|cdrom|netinst|netboot|"
-"businesscard|live|disabled] [--debian-installer-distribution CODENAME|daily] "
-"[--debian-installer-preseedfile FILE|URL] ..."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:38
-msgid ""
-"The values \"Normal\", \"Live\" and \"Ubuntu\" are not valid values for #"
-"{LH_BINARY_DEBIAN_INSTALLER}#. Refer to the output of #{lh_config}# cited "
-"above to choose the appropriate values."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:40
msgid "2~ WiFi Connection"
msgstr ""
#. type: Plain text
-#: en/other_common-tasks.ssi:41
+#: en/other_common-tasks.ssi:7
msgid ""
"Depending on the Debian Live image you are using and the given tools "
"configured with your Debian Live image you may need to only attach to an "
diff --git a/manual/po/fr/user_customization-installer.ssi.po b/manual/po/fr/user_customization-installer.ssi.po
new file mode 100644
index 0000000..373c049
--- /dev/null
+++ b/manual/po/fr/user_customization-installer.ssi.po
@@ -0,0 +1,121 @@
+# 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-11-30 10:53+0100\n"
+"PO-Revision-Date: 2010-11-30 10:53+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:2
+msgid ":B~ Customizing Debian Installer"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:4
+msgid "1~customizing-installer Customizing Debian Installer"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:6
+msgid ""
+"Debian Live system images can be integrated with Debian Installer. There are "
+"number of different \"types\" of installation, varying in what and how to "
+"install the image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:8
+msgid ""
+"Please note the careful use of capital letters when referring to the "
+"\"Debian Installer\" in this section - when used like this we refer "
+"explicitly to the official installer for the Debian system, not anything "
+"else. It is often seen abbreviated to \"d-i\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:10
+msgid "The three main types of installer are:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:12
+msgid ""
+"_* *{\"Regular\" Debian Installer}*: This is a normal Debian Live image with "
+"a seperate kernel and initrd which (when selected from the appropriate "
+"bootloader) launches into a standard Debian Installer instance, just as if "
+"you had downloaded a CD image of Debian and booted it. Images containing a "
+"live system and such an otherwise indepentend installer are often referet to "
+"as \"combined images\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:14
+msgid ""
+"On such images, Debian is installed by fetching and installing .deb 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."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:16
+msgid ""
+"This whole process can be preseeded and customized in a number of ways; see "
+"the relevant pages in the Debian Installer manual for more information. Once "
+"you have a working preseeding file, live-build can automatically place it to "
+"the image and enable it for you."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:18
+msgid ""
+"_* *{\"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."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:20
+msgid ""
+"Installation will proceed in an identical fashion to the \"Regular\" "
+"installation described above, but at the actual package installation stage, "
+"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
+"filesystem image is copied to the target. This is acchieved with a special "
+"udeb called live-installer. live-installer can be preseeded to be disabled, "
+"allowing to support normal and live installer entries in the bootloader of "
+"the same live media."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:22
+msgid ""
+"After this stage, the Debian Installer continues as normal, installing and "
+"configuring items such as bootloaders and local users, etc."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:24
+msgid ""
+"_* *{\"Desktop\" Debian Installer}*: Regardless of the mode Debian Installer "
+"is used in, d-i can be launched from the Desktop by clicking on an icon. "
+"This is user friendlier in some situations. In order to make use of this, "
+"the debian-installer-launcher package needs to be included."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:25
+msgid ""
+"Note that by default live-build does not include Debian Installer images in "
+"the images, it needs to be specifically enabled with lb config."
+msgstr ""
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 61ac4d5..3ec4b5c 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 10:39+0100\n"
+"POT-Creation-Date: 2010-11-30 10:53+0100\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -131,41 +131,46 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:49
-msgid ":B~ Development ~#"
+msgid "<< user_customization-installer.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:51
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:53
-msgid "<< project_bugs.ssi"
+msgid ":B~ Project ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:55
-msgid "<< project_procedures.ssi"
+msgid "<< project_bugs.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:57
-msgid ":B~ Examples ~#"
+msgid "<< project_procedures.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:59
-msgid "<< user_examples.ssi"
+msgid ":B~ Examples ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:61
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:63
msgid ":B~ Other ~#"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:69
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 "
@@ -175,51 +180,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:71
msgid "% << other_customization-bootup.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:71
+#: en/live-manual.ssm:73
msgid "% << other_customization-binary.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:75
msgid "% << other_common-tasks.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:77
msgid "% << other_live-environment.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:79
msgid "% << other_faq.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:81
msgid "% << other_howtos.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:81
+#: en/live-manual.ssm:83
msgid "% << other_coding-style.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:83
+#: en/live-manual.ssm:85
msgid "% << other_resources.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:85
+#: en/live-manual.ssm:87
msgid "% << other_configuration-layout.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:86
+#: en/live-manual.ssm:88
msgid "% << other_configuration-files.ssi"
msgstr ""
diff --git a/manual/po/pt_BR/other_common-tasks.ssi.po b/manual/po/pt_BR/other_common-tasks.ssi.po
index 2c13b2b..7e45381 100644
--- a/manual/po/pt_BR/other_common-tasks.ssi.po
+++ b/manual/po/pt_BR/other_common-tasks.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"POT-Creation-Date: 2010-11-30 10:53+0100\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,126 +17,6 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: 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_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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: 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_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: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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
#: en/other_common-tasks.ssi:2
msgid "B~ Common tasks"
msgstr ""
@@ -148,126 +28,11 @@ msgstr ""
#. type: Plain text
#: en/other_common-tasks.ssi:6
-msgid "2~ The Debian Installer"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:8
-msgid ""
-"Although Debian Live is mostly concerned with avoiding permanent "
-"installation, integrating some form of installer to your image is possible. "
-"There are number of different \"types\" of installation, varying in what and "
-"how to install the image."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:10
-msgid ""
-"Please note the careful use of capital letters when referring to the "
-"\"Debian Installer\" in this section - when used like this we refer "
-"explicitly to the official installer for the Debian system, not anything "
-"else. It is often seen abbreviated to \"d-i\"."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:12
-msgid "The three main types of installer are:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:14
-msgid ""
-"_* *{\"Normal\" Debian Installer}*: This is a normal Debian Live image with "
-"a seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into a standard Debian Installer instance, just as if "
-"you had downloaded a CD image of Debian and booted it."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:16
-msgid ""
-"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."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:18
-msgid ""
-"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 ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:20
-msgid ""
-"_* *{\"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."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:22
-msgid ""
-"Installation will proceed in an identical fashion to the \"Normal\" "
-"installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
-"filesystem image is copied to the target. After this stage, the Debian "
-"Installer continues as normal, installing and configuring items such as "
-"bootloaders and local users, etc."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:24
-msgid "This is working now."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:26
-msgid ""
-"_* *{\"Ubuntu\"-style installer}*: This is where you boot into a graphical "
-"Debian Live system and run a wizard-based program which installs and "
-"configures the live system, all the time remaining inside the live graphical "
-"environment."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:28
-msgid "This is currently NOT possible with Debian Live."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:30
-msgid ""
-"By default, no installer will be included in the Debian Live image. You can "
-"enable it by using #{lh_config}#:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:34
-msgid ""
-"$ lh_config --help ... [--debian-installer enabled|cdrom|netinst|netboot|"
-"businesscard|live|disabled] [--debian-installer-distribution CODENAME|daily] "
-"[--debian-installer-preseedfile FILE|URL] ..."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:38
-msgid ""
-"The values \"Normal\", \"Live\" and \"Ubuntu\" are not valid values for #"
-"{LH_BINARY_DEBIAN_INSTALLER}#. Refer to the output of #{lh_config}# cited "
-"above to choose the appropriate values."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:40
msgid "2~ WiFi Connection"
msgstr ""
#. type: Plain text
-#: en/other_common-tasks.ssi:41
+#: en/other_common-tasks.ssi:7
msgid ""
"Depending on the Debian Live image you are using and the given tools "
"configured with your Debian Live image you may need to only attach to an "
diff --git a/manual/po/pt_BR/user_customization-installer.ssi.po b/manual/po/pt_BR/user_customization-installer.ssi.po
new file mode 100644
index 0000000..dcab1d5
--- /dev/null
+++ b/manual/po/pt_BR/user_customization-installer.ssi.po
@@ -0,0 +1,121 @@
+# 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-11-30 10:53+0100\n"
+"PO-Revision-Date: 2010-11-30 10:53+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:2
+msgid ":B~ Customizing Debian Installer"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:4
+msgid "1~customizing-installer Customizing Debian Installer"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:6
+msgid ""
+"Debian Live system images can be integrated with Debian Installer. There are "
+"number of different \"types\" of installation, varying in what and how to "
+"install the image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:8
+msgid ""
+"Please note the careful use of capital letters when referring to the "
+"\"Debian Installer\" in this section - when used like this we refer "
+"explicitly to the official installer for the Debian system, not anything "
+"else. It is often seen abbreviated to \"d-i\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:10
+msgid "The three main types of installer are:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:12
+msgid ""
+"_* *{\"Regular\" Debian Installer}*: This is a normal Debian Live image with "
+"a seperate kernel and initrd which (when selected from the appropriate "
+"bootloader) launches into a standard Debian Installer instance, just as if "
+"you had downloaded a CD image of Debian and booted it. Images containing a "
+"live system and such an otherwise indepentend installer are often referet to "
+"as \"combined images\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:14
+msgid ""
+"On such images, Debian is installed by fetching and installing .deb 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."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:16
+msgid ""
+"This whole process can be preseeded and customized in a number of ways; see "
+"the relevant pages in the Debian Installer manual for more information. Once "
+"you have a working preseeding file, live-build can automatically place it to "
+"the image and enable it for you."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:18
+msgid ""
+"_* *{\"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."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:20
+msgid ""
+"Installation will proceed in an identical fashion to the \"Regular\" "
+"installation described above, but at the actual package installation stage, "
+"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
+"filesystem image is copied to the target. This is acchieved with a special "
+"udeb called live-installer. live-installer can be preseeded to be disabled, "
+"allowing to support normal and live installer entries in the bootloader of "
+"the same live media."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:22
+msgid ""
+"After this stage, the Debian Installer continues as normal, installing and "
+"configuring items such as bootloaders and local users, etc."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:24
+msgid ""
+"_* *{\"Desktop\" Debian Installer}*: Regardless of the mode Debian Installer "
+"is used in, d-i can be launched from the Desktop by clicking on an icon. "
+"This is user friendlier in some situations. In order to make use of this, "
+"the debian-installer-launcher package needs to be included."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:25
+msgid ""
+"Note that by default live-build does not include Debian Installer images in "
+"the images, it needs to be specifically enabled with lb config."
+msgstr ""
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 7dbd434..f4f9657 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-30 10:39+0100\n"
+"POT-Creation-Date: 2010-11-30 10:53+0100\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -132,41 +132,46 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:49
-msgid ":B~ Development ~#"
+msgid "<< user_customization-installer.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:51
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:53
-msgid "<< project_bugs.ssi"
+msgid ":B~ Project ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:55
-msgid "<< project_procedures.ssi"
+msgid "<< project_bugs.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:57
-msgid ":B~ Examples ~#"
+msgid "<< project_procedures.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:59
-msgid "<< user_examples.ssi"
+msgid ":B~ Examples ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:61
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:63
msgid ":B~ Other ~#"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:69
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 "
@@ -176,51 +181,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:71
msgid "% << other_customization-bootup.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:71
+#: en/live-manual.ssm:73
msgid "% << other_customization-binary.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:75
msgid "% << other_common-tasks.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:77
msgid "% << other_live-environment.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:79
msgid "% << other_faq.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:81
msgid "% << other_howtos.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:81
+#: en/live-manual.ssm:83
msgid "% << other_coding-style.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:83
+#: en/live-manual.ssm:85
msgid "% << other_resources.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:85
+#: en/live-manual.ssm:87
msgid "% << other_configuration-layout.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:86
+#: en/live-manual.ssm:88
msgid "% << other_configuration-files.ssi"
msgstr ""
diff --git a/manual/po/ro/other_common-tasks.ssi.po b/manual/po/ro/other_common-tasks.ssi.po
index 697ec41..6993aa8 100644
--- a/manual/po/ro/other_common-tasks.ssi.po
+++ b/manual/po/ro/other_common-tasks.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-16 14:45-0200\n"
+"POT-Creation-Date: 2010-11-30 10:53+0100\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,126 +18,6 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: 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_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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr "code{"
-
-#. type: Plain text
-#: 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_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: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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr "}code"
-
-#. type: Plain text
#: en/other_common-tasks.ssi:2
msgid "B~ Common tasks"
msgstr ""
@@ -149,126 +29,11 @@ msgstr ""
#. type: Plain text
#: en/other_common-tasks.ssi:6
-msgid "2~ The Debian Installer"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:8
-msgid ""
-"Although Debian Live is mostly concerned with avoiding permanent "
-"installation, integrating some form of installer to your image is possible. "
-"There are number of different \"types\" of installation, varying in what and "
-"how to install the image."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:10
-msgid ""
-"Please note the careful use of capital letters when referring to the "
-"\"Debian Installer\" in this section - when used like this we refer "
-"explicitly to the official installer for the Debian system, not anything "
-"else. It is often seen abbreviated to \"d-i\"."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:12
-msgid "The three main types of installer are:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:14
-msgid ""
-"_* *{\"Normal\" Debian Installer}*: This is a normal Debian Live image with "
-"a seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into a standard Debian Installer instance, just as if "
-"you had downloaded a CD image of Debian and booted it."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:16
-msgid ""
-"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."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:18
-msgid ""
-"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 ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:20
-msgid ""
-"_* *{\"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."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:22
-msgid ""
-"Installation will proceed in an identical fashion to the \"Normal\" "
-"installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
-"filesystem image is copied to the target. After this stage, the Debian "
-"Installer continues as normal, installing and configuring items such as "
-"bootloaders and local users, etc."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:24
-msgid "This is working now."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:26
-msgid ""
-"_* *{\"Ubuntu\"-style installer}*: This is where you boot into a graphical "
-"Debian Live system and run a wizard-based program which installs and "
-"configures the live system, all the time remaining inside the live graphical "
-"environment."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:28
-msgid "This is currently NOT possible with Debian Live."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:30
-msgid ""
-"By default, no installer will be included in the Debian Live image. You can "
-"enable it by using #{lh_config}#:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:34
-msgid ""
-"$ lh_config --help ... [--debian-installer enabled|cdrom|netinst|netboot|"
-"businesscard|live|disabled] [--debian-installer-distribution CODENAME|daily] "
-"[--debian-installer-preseedfile FILE|URL] ..."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:38
-msgid ""
-"The values \"Normal\", \"Live\" and \"Ubuntu\" are not valid values for #"
-"{LH_BINARY_DEBIAN_INSTALLER}#. Refer to the output of #{lh_config}# cited "
-"above to choose the appropriate values."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:40
msgid "2~ WiFi Connection"
msgstr ""
#. type: Plain text
-#: en/other_common-tasks.ssi:41
+#: en/other_common-tasks.ssi:7
msgid ""
"Depending on the Debian Live image you are using and the given tools "
"configured with your Debian Live image you may need to only attach to an "
diff --git a/manual/po/ro/user_customization-installer.ssi.po b/manual/po/ro/user_customization-installer.ssi.po
new file mode 100644
index 0000000..a040b40
--- /dev/null
+++ b/manual/po/ro/user_customization-installer.ssi.po
@@ -0,0 +1,122 @@
+# 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-11-30 10:53+0100\n"
+"PO-Revision-Date: 2010-11-30 10:53+0100\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ASCII\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-installer.ssi:2
+msgid ":B~ Customizing Debian Installer"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:4
+msgid "1~customizing-installer Customizing Debian Installer"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:6
+msgid ""
+"Debian Live system images can be integrated with Debian Installer. There are "
+"number of different \"types\" of installation, varying in what and how to "
+"install the image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:8
+msgid ""
+"Please note the careful use of capital letters when referring to the "
+"\"Debian Installer\" in this section - when used like this we refer "
+"explicitly to the official installer for the Debian system, not anything "
+"else. It is often seen abbreviated to \"d-i\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:10
+msgid "The three main types of installer are:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:12
+msgid ""
+"_* *{\"Regular\" Debian Installer}*: This is a normal Debian Live image with "
+"a seperate kernel and initrd which (when selected from the appropriate "
+"bootloader) launches into a standard Debian Installer instance, just as if "
+"you had downloaded a CD image of Debian and booted it. Images containing a "
+"live system and such an otherwise indepentend installer are often referet to "
+"as \"combined images\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:14
+msgid ""
+"On such images, Debian is installed by fetching and installing .deb 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."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:16
+msgid ""
+"This whole process can be preseeded and customized in a number of ways; see "
+"the relevant pages in the Debian Installer manual for more information. Once "
+"you have a working preseeding file, live-build can automatically place it to "
+"the image and enable it for you."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:18
+msgid ""
+"_* *{\"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."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:20
+msgid ""
+"Installation will proceed in an identical fashion to the \"Regular\" "
+"installation described above, but at the actual package installation stage, "
+"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
+"filesystem image is copied to the target. This is acchieved with a special "
+"udeb called live-installer. live-installer can be preseeded to be disabled, "
+"allowing to support normal and live installer entries in the bootloader of "
+"the same live media."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:22
+msgid ""
+"After this stage, the Debian Installer continues as normal, installing and "
+"configuring items such as bootloaders and local users, etc."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:24
+msgid ""
+"_* *{\"Desktop\" Debian Installer}*: Regardless of the mode Debian Installer "
+"is used in, d-i can be launched from the Desktop by clicking on an icon. "
+"This is user friendlier in some situations. In order to make use of this, "
+"the debian-installer-launcher package needs to be included."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:25
+msgid ""
+"Note that by default live-build does not include Debian Installer images in "
+"the images, it needs to be specifically enabled with lb config."
+msgstr ""
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index 98715af..69324e8 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -17,6 +17,7 @@
[type: text] en/project_procedures.ssi $lang:$lang/project_procedures.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-installer.ssi $lang:$lang/user_customization-installer.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
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 1a83318..af1fa99 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-11-30 10:39+0100\n"
+"POT-Creation-Date: 2010-11-30 10:53+0100\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"
@@ -131,41 +131,46 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:49
-msgid ":B~ Development ~#"
+msgid "<< user_customization-installer.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:51
-msgid ":B~ Project ~#"
+msgid ":B~ Development ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:53
-msgid "<< project_bugs.ssi"
+msgid ":B~ Project ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:55
-msgid "<< project_procedures.ssi"
+msgid "<< project_bugs.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:57
-msgid ":B~ Examples ~#"
+msgid "<< project_procedures.ssi"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:59
-msgid "<< user_examples.ssi"
+msgid ":B~ Examples ~#"
msgstr ""
#. type: Plain text
#: en/live-manual.ssm:61
+msgid "<< user_examples.ssi"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:63
msgid ":B~ Other ~#"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:69
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 "
@@ -175,51 +180,51 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:71
msgid "% << other_customization-bootup.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:71
+#: en/live-manual.ssm:73
msgid "% << other_customization-binary.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:75
msgid "% << other_common-tasks.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:77
msgid "% << other_live-environment.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:79
msgid "% << other_faq.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:81
msgid "% << other_howtos.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:81
+#: en/live-manual.ssm:83
msgid "% << other_coding-style.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:83
+#: en/live-manual.ssm:85
msgid "% << other_resources.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:85
+#: en/live-manual.ssm:87
msgid "% << other_configuration-layout.ssi"
msgstr ""
#. type: Plain text
-#: en/live-manual.ssm:86
+#: en/live-manual.ssm:88
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 d432b89..9131bad 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-16 14:45-0200\n"
+"POT-Creation-Date: 2010-11-30 10:53+0100\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,126 +17,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: 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_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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: 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_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: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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
#: en/other_common-tasks.ssi:2
msgid "B~ Common tasks"
msgstr ""
@@ -148,126 +28,11 @@ msgstr ""
#. type: Plain text
#: en/other_common-tasks.ssi:6
-msgid "2~ The Debian Installer"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:8
-msgid ""
-"Although Debian Live is mostly concerned with avoiding permanent "
-"installation, integrating some form of installer to your image is possible. "
-"There are number of different \"types\" of installation, varying in what and "
-"how to install the image."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:10
-msgid ""
-"Please note the careful use of capital letters when referring to the "
-"\"Debian Installer\" in this section - when used like this we refer "
-"explicitly to the official installer for the Debian system, not anything "
-"else. It is often seen abbreviated to \"d-i\"."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:12
-msgid "The three main types of installer are:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:14
-msgid ""
-"_* *{\"Normal\" Debian Installer}*: This is a normal Debian Live image with "
-"a seperate kernel and initrd which (when selected from the appropriate "
-"bootloader) launches into a standard Debian Installer instance, just as if "
-"you had downloaded a CD image of Debian and booted it."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:16
-msgid ""
-"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."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:18
-msgid ""
-"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 ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:20
-msgid ""
-"_* *{\"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."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:22
-msgid ""
-"Installation will proceed in an identical fashion to the \"Normal\" "
-"installation described above, but at the actual package installation stage, "
-"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
-"filesystem image is copied to the target. After this stage, the Debian "
-"Installer continues as normal, installing and configuring items such as "
-"bootloaders and local users, etc."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:24
-msgid "This is working now."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:26
-msgid ""
-"_* *{\"Ubuntu\"-style installer}*: This is where you boot into a graphical "
-"Debian Live system and run a wizard-based program which installs and "
-"configures the live system, all the time remaining inside the live graphical "
-"environment."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:28
-msgid "This is currently NOT possible with Debian Live."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:30
-msgid ""
-"By default, no installer will be included in the Debian Live image. You can "
-"enable it by using #{lh_config}#:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:34
-msgid ""
-"$ lh_config --help ... [--debian-installer enabled|cdrom|netinst|netboot|"
-"businesscard|live|disabled] [--debian-installer-distribution CODENAME|daily] "
-"[--debian-installer-preseedfile FILE|URL] ..."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:38
-msgid ""
-"The values \"Normal\", \"Live\" and \"Ubuntu\" are not valid values for #"
-"{LH_BINARY_DEBIAN_INSTALLER}#. Refer to the output of #{lh_config}# cited "
-"above to choose the appropriate values."
-msgstr ""
-
-#. type: Plain text
-#: en/other_common-tasks.ssi:40
msgid "2~ WiFi Connection"
msgstr ""
#. type: Plain text
-#: en/other_common-tasks.ssi:41
+#: en/other_common-tasks.ssi:7
msgid ""
"Depending on the Debian Live image you are using and the given tools "
"configured with your Debian Live image you may need to only attach to an "
diff --git a/manual/pot/user_customization-installer.ssi.pot b/manual/pot/user_customization-installer.ssi.pot
new file mode 100644
index 0000000..454af8e
--- /dev/null
+++ b/manual/pot/user_customization-installer.ssi.pot
@@ -0,0 +1,121 @@
+# 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-11-30 10:53+0100\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-installer.ssi:2
+msgid ":B~ Customizing Debian Installer"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:4
+msgid "1~customizing-installer Customizing Debian Installer"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:6
+msgid ""
+"Debian Live system images can be integrated with Debian Installer. There are "
+"number of different \"types\" of installation, varying in what and how to "
+"install the image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:8
+msgid ""
+"Please note the careful use of capital letters when referring to the "
+"\"Debian Installer\" in this section - when used like this we refer "
+"explicitly to the official installer for the Debian system, not anything "
+"else. It is often seen abbreviated to \"d-i\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:10
+msgid "The three main types of installer are:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:12
+msgid ""
+"_* *{\"Regular\" Debian Installer}*: This is a normal Debian Live image with "
+"a seperate kernel and initrd which (when selected from the appropriate "
+"bootloader) launches into a standard Debian Installer instance, just as if "
+"you had downloaded a CD image of Debian and booted it. Images containing a "
+"live system and such an otherwise indepentend installer are often referet to "
+"as \"combined images\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:14
+msgid ""
+"On such images, Debian is installed by fetching and installing .deb 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."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:16
+msgid ""
+"This whole process can be preseeded and customized in a number of ways; see "
+"the relevant pages in the Debian Installer manual for more information. Once "
+"you have a working preseeding file, live-build can automatically place it to "
+"the image and enable it for you."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:18
+msgid ""
+"_* *{\"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."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:20
+msgid ""
+"Installation will proceed in an identical fashion to the \"Regular\" "
+"installation described above, but at the actual package installation stage, "
+"instead of using #{debootstrap}# to fetch and install packages, the \"live\" "
+"filesystem image is copied to the target. This is acchieved with a special "
+"udeb called live-installer. live-installer can be preseeded to be disabled, "
+"allowing to support normal and live installer entries in the bootloader of "
+"the same live media."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:22
+msgid ""
+"After this stage, the Debian Installer continues as normal, installing and "
+"configuring items such as bootloaders and local users, etc."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:24
+msgid ""
+"_* *{\"Desktop\" Debian Installer}*: Regardless of the mode Debian Installer "
+"is used in, d-i can be launched from the Desktop by clicking on an icon. "
+"This is user friendlier in some situations. In order to make use of this, "
+"the debian-installer-launcher package needs to be included."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-installer.ssi:25
+msgid ""
+"Note that by default live-build does not include Debian Installer images in "
+"the images, it needs to be specifically enabled with lb config."
+msgstr ""
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 2db800f..cfda310 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -45,6 +45,8 @@
<< user_customization-internationalization.ssi
+<< user_customization-installer.ssi
+
:B~ Development ~#
:B~ Project ~#
diff --git a/manual/pt_BR/other_common-tasks.ssi b/manual/pt_BR/other_common-tasks.ssi
index 98cb5d7..d9832a3 100644
--- a/manual/pt_BR/other_common-tasks.ssi
+++ b/manual/pt_BR/other_common-tasks.ssi
@@ -2,70 +2,6 @@ B~ Common tasks
1~ Common tasks
-2~ The Debian Installer
-
-Although Debian Live is mostly concerned with avoiding permanent
-installation, integrating some form of installer to your image is
-possible. There are number of different "types" of installation, varying in
-what and how to install the image.
-
-Please note the careful use of capital letters when referring to the "Debian
-Installer" in this section - when used like this we refer explicitly to the
-official installer for the Debian system, not anything else. It is often
-seen abbreviated to "d-i".
-
-The three main types of installer are:
-
-_* *{"Normal" Debian Installer}*: This is a normal Debian Live image with a
-seperate kernel and initrd which (when selected from the appropriate
-bootloader) launches into a standard Debian Installer instance, just as if
-you had downloaded a CD image of Debian and booted it.
-
-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 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.
-
-Installation will proceed in an identical fashion to the "Normal"
-installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the "live"
-filesystem image is copied to the target. After this stage, the Debian
-Installer continues as normal, installing and configuring items such as
-bootloaders and local users, etc.
-
-This is working now.
-
-_* *{"Ubuntu"-style installer}*: This is where you boot into a graphical
-Debian Live system and run a wizard-based program which installs and
-configures the live system, all the time remaining inside the live graphical
-environment.
-
-This is currently NOT possible with Debian Live.
-
-By default, no installer will be included in the Debian Live image. You can
-enable it by using #{lh_config}#:
-
-code{
-
-$ lh_config --help ... [--debian-installer
-enabled|cdrom|netinst|netboot|businesscard|live|disabled]
-[--debian-installer-distribution CODENAME|daily]
-[--debian-installer-preseedfile FILE|URL] ...
-
-}code
-
-The values "Normal", "Live" and "Ubuntu" are not valid values for
-#{LH_BINARY_DEBIAN_INSTALLER}#. Refer to the output of #{lh_config}# cited
-above to choose the appropriate values.
-
2~ WiFi Connection
Depending on the Debian Live image you are using and the given tools
diff --git a/manual/pt_BR/user_customization-installer.ssi b/manual/pt_BR/user_customization-installer.ssi
new file mode 100644
index 0000000..fcb326a
--- /dev/null
+++ b/manual/pt_BR/user_customization-installer.ssi
@@ -0,0 +1,54 @@
+:B~ Customizing Debian Installer
+
+1~customizing-installer Customizing Debian Installer
+
+Debian Live system images can be integrated with Debian Installer. There are
+number of different "types" of installation, varying in what and how to
+install the image.
+
+Please note the careful use of capital letters when referring to the "Debian
+Installer" in this section - when used like this we refer explicitly to the
+official installer for the Debian system, not anything else. It is often
+seen abbreviated to "d-i".
+
+The three main types of installer are:
+
+_* *{"Regular" Debian Installer}*: This is a normal Debian Live image with a
+seperate kernel and initrd which (when selected from the appropriate
+bootloader) launches into a standard Debian Installer instance, just as if
+you had downloaded a CD image of Debian and booted it. Images containing a
+live system and such an otherwise indepentend installer are often referet to
+as "combined images".
+
+On such images, Debian is installed by fetching and installing .deb 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 customized in a number of ways; see
+the relevant pages in the Debian Installer manual for more information. Once
+you have a working preseeding file, live-build can automatically place it to
+the image and enable it for you.
+
+_* *{"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.
+
+Installation will proceed in an identical fashion to the "Regular"
+installation described above, but at the actual package installation stage,
+instead of using #{debootstrap}# to fetch and install packages, the "live"
+filesystem image is copied to the target. This is acchieved with a special
+udeb called live-installer. live-installer can be preseeded to be disabled,
+allowing to support normal and live installer entries in the bootloader of
+the same live media.
+
+After this stage, the Debian Installer continues as normal, installing and
+configuring items such as bootloaders and local users, etc.
+
+_* *{"Desktop" Debian Installer}*: Regardless of the mode Debian Installer
+is used in, d-i can be launched from the Desktop by clicking on an
+icon. This is user friendlier in some situations. In order to make use of
+this, the debian-installer-launcher package needs to be included.
+
+Note that by default live-build does not include Debian Installer images in
+the images, it needs to be specifically enabled with lb config.
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 2db800f..cfda310 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -45,6 +45,8 @@
<< user_customization-internationalization.ssi
+<< user_customization-installer.ssi
+
:B~ Development ~#
:B~ Project ~#
diff --git a/manual/ro/other_common-tasks.ssi b/manual/ro/other_common-tasks.ssi
index 98cb5d7..d9832a3 100644
--- a/manual/ro/other_common-tasks.ssi
+++ b/manual/ro/other_common-tasks.ssi
@@ -2,70 +2,6 @@ B~ Common tasks
1~ Common tasks
-2~ The Debian Installer
-
-Although Debian Live is mostly concerned with avoiding permanent
-installation, integrating some form of installer to your image is
-possible. There are number of different "types" of installation, varying in
-what and how to install the image.
-
-Please note the careful use of capital letters when referring to the "Debian
-Installer" in this section - when used like this we refer explicitly to the
-official installer for the Debian system, not anything else. It is often
-seen abbreviated to "d-i".
-
-The three main types of installer are:
-
-_* *{"Normal" Debian Installer}*: This is a normal Debian Live image with a
-seperate kernel and initrd which (when selected from the appropriate
-bootloader) launches into a standard Debian Installer instance, just as if
-you had downloaded a CD image of Debian and booted it.
-
-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 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.
-
-Installation will proceed in an identical fashion to the "Normal"
-installation described above, but at the actual package installation stage,
-instead of using #{debootstrap}# to fetch and install packages, the "live"
-filesystem image is copied to the target. After this stage, the Debian
-Installer continues as normal, installing and configuring items such as
-bootloaders and local users, etc.
-
-This is working now.
-
-_* *{"Ubuntu"-style installer}*: This is where you boot into a graphical
-Debian Live system and run a wizard-based program which installs and
-configures the live system, all the time remaining inside the live graphical
-environment.
-
-This is currently NOT possible with Debian Live.
-
-By default, no installer will be included in the Debian Live image. You can
-enable it by using #{lh_config}#:
-
-code{
-
-$ lh_config --help ... [--debian-installer
-enabled|cdrom|netinst|netboot|businesscard|live|disabled]
-[--debian-installer-distribution CODENAME|daily]
-[--debian-installer-preseedfile FILE|URL] ...
-
-}code
-
-The values "Normal", "Live" and "Ubuntu" are not valid values for
-#{LH_BINARY_DEBIAN_INSTALLER}#. Refer to the output of #{lh_config}# cited
-above to choose the appropriate values.
-
2~ WiFi Connection
Depending on the Debian Live image you are using and the given tools
diff --git a/manual/ro/user_customization-installer.ssi b/manual/ro/user_customization-installer.ssi
new file mode 100644
index 0000000..fcb326a
--- /dev/null
+++ b/manual/ro/user_customization-installer.ssi
@@ -0,0 +1,54 @@
+:B~ Customizing Debian Installer
+
+1~customizing-installer Customizing Debian Installer
+
+Debian Live system images can be integrated with Debian Installer. There are
+number of different "types" of installation, varying in what and how to
+install the image.
+
+Please note the careful use of capital letters when referring to the "Debian
+Installer" in this section - when used like this we refer explicitly to the
+official installer for the Debian system, not anything else. It is often
+seen abbreviated to "d-i".
+
+The three main types of installer are:
+
+_* *{"Regular" Debian Installer}*: This is a normal Debian Live image with a
+seperate kernel and initrd which (when selected from the appropriate
+bootloader) launches into a standard Debian Installer instance, just as if
+you had downloaded a CD image of Debian and booted it. Images containing a
+live system and such an otherwise indepentend installer are often referet to
+as "combined images".
+
+On such images, Debian is installed by fetching and installing .deb 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 customized in a number of ways; see
+the relevant pages in the Debian Installer manual for more information. Once
+you have a working preseeding file, live-build can automatically place it to
+the image and enable it for you.
+
+_* *{"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.
+
+Installation will proceed in an identical fashion to the "Regular"
+installation described above, but at the actual package installation stage,
+instead of using #{debootstrap}# to fetch and install packages, the "live"
+filesystem image is copied to the target. This is acchieved with a special
+udeb called live-installer. live-installer can be preseeded to be disabled,
+allowing to support normal and live installer entries in the bootloader of
+the same live media.
+
+After this stage, the Debian Installer continues as normal, installing and
+configuring items such as bootloaders and local users, etc.
+
+_* *{"Desktop" Debian Installer}*: Regardless of the mode Debian Installer
+is used in, d-i can be launched from the Desktop by clicking on an
+icon. This is user friendlier in some situations. In order to make use of
+this, the debian-installer-launcher package needs to be included.
+
+Note that by default live-build does not include Debian Installer images in
+the images, it needs to be specifically enabled with lb config.
--
live-manual
More information about the debian-live-changes
mailing list