[SCM] live-manual branch, debian-next, updated. debian/3.0_a8-1-39-g5fb87c4
Ben Armstrong
synrg at debian.org
Mon Nov 7 12:18:20 UTC 2011
The following commit has been merged in the debian-next branch:
commit 5fb87c481cceb635464a17cc1eb4c575c02b7cc8
Author: Ben Armstrong <synrg at debian.org>
Date: Mon Nov 7 08:18:11 2011 -0400
Updating translation strings for recent commits.
diff --git a/manual/de/index.html.in b/manual/de/index.html.in
index 68f1f56..864114d 100644
--- a/manual/de/index.html.in
+++ b/manual/de/index.html.in
@@ -9,26 +9,25 @@
<h2>Debian Live Handbuch</h2>
<p>
- Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste
-unter <a
+ Please report errors, omissions, patches and suggestions to our mailinglist
+at <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-(englischspraching) gemeldet werden. Informationen wie man <a
-href="html/about-manual.html#how-to-contribute">zum Handbuch beitragen</a>
-kann, können im Handbuch gefunden werden.
+and read about <a href="html/about-manual.en.html#how-to-contribute">how to
+contribute</a> to the manual.
</p>
<h3>Verfügbare Formate</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">mehrere Seiten</a>, <a
-href="html/live-manual.html">einzelne Seite</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 Hochformat</a>, <a
-href="pdf/live-manual.landscape-a4.pdf">A4 Querformat</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">Letter Hochformat</a>, <a
-href="pdf/live-manual.landscape-letter.pdf">Letter Querformat</a></li>
- <li><a href="txt/live-manual.txt">Text</a></li>
+ <li><a href="epub/live-manual.en.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.en.html">multi page</a>, <a
+href="html/live-manual.en.html">single page</a></li>
+ <li><a href="odf/live-manual.en.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.en.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape-a4.en.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait-letter.en.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape-letter.en.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.en.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index bdb8c91..89a2a6e 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-11-06
+ :published: 2011-11-07
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index 814ba40..e7d92bd 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -42,15 +42,15 @@ files that can be simply added or replaced in the image without processing;
see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
needed.
-To include files, simply add them to your #{config/chroot_local-includes}#
+To include files, simply add them to your #{config/includes.chroot}#
directory. This directory corresponds to the root directory (#{/}#) of the
live system. For example, to add a file #{/var/www/index.html}# in the live
system, use:
code{
- $ mkdir -p config/chroot_local-includes/var/www
- $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -60,7 +60,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -80,11 +80,11 @@ booting the Live system, you can use binary local includes. This works in a
similar fashion to chroot local includes. For example, suppose the files
#{~/video_demo.*}# are demo videos of the live system described by and
linked to by an HTML index page. Simply copy the material to
-#{config/binary_local-includes/}# as follows:
+#{config/includes.binary/}# as follows:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -128,7 +128,7 @@ explained in the "Customization" section of its man page. Examine
live-config's own hooks provided in #{/lib/live/config/}#, noting the
sequence numbers. Then provide your own hook prefixed with an appropriate
sequence number, either as a chroot local include in
-#{config/chroot_local-includes/lib/live/config/}#, or as a custom package as
+#{config/includes.chroot/lib/live/config/}#, or as a custom package as
discussed in {Installing modified or third-party
packages}#installing-modified-or-third-party-packages.
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 8860bc8..568ef99 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -463,7 +463,7 @@ with:
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -506,7 +506,7 @@ and #{aptitude}# for details.
For background, please first read the #{apt_preferences(5)}# man page. APT
pinning can be configured either for build time, or else for run time. For
the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/apt/preferences}#.
+#{config/includes.chroot/etc/apt/preferences}#.
Let's say you are building a Squeeze live system but need all the live
packages that end up in the binary image to be installed from Sid at build
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index 4bbf347..97dccb6 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -42,7 +42,7 @@ One possible way of changing the default password is by means of a hook as
described in {Boot-time hooks}#boot-time-hooks. In order to do that you can
use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#,
prefix it accordingly (e.g. 200-passwd) and add it to
-#{config/chroot_local-includes/lib/live/config/}#
+#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Customizing locale and language
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index eb2dac8..6cf6ccb 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -132,7 +132,7 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
+ --linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -148,7 +148,7 @@ code{
First, #{--architecture i386}# ensures that on our #{amd64}# build system,
we build a 32-bit version suitable for use on most machines. Second, we use
-#{--linux-flavours 686}# because we don't anticipate using this image on
+#{--linux-flavours 686-pae}# because we don't anticipate using this image on
much older systems. Third, we've chosen the #{lxde}# package list to give us
a minimal desktop. And finally, we have added two initial favourite
packages: #{iceweasel}# and #{xchat}#.
@@ -242,7 +242,7 @@ code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
$ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
@@ -254,8 +254,8 @@ to port #{5901}# on a server at #{192.168.1.2}#:
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat >config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -292,7 +292,7 @@ packages will most likely produce a broken live system.
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
@@ -311,8 +311,8 @@ by the default configuration in {Tutorial 1}#tutorial-1.
The biggest space-saver here, compared to building a standard image on an
#{i386}# architecture system, is to select only the #{486}# kernel flavour
-instead of the default #{-k "486 686"}#. Leaving off APT's indices with
-#{--binary-indices false}# also saves a fair amount of space, the tradeoff
+instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
+#{--apt-indices false}# also saves a fair amount of space, the tradeoff
being that you need to #{apt-get update}# before using apt in the live
system. Choosing the #{minimal}# package list leaves out the large
#{locales}# package and associated utilities. Dropping recommended packages
@@ -347,12 +347,8 @@ Now we can search for the appropriate tasks, first with:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
@@ -361,14 +357,9 @@ brazilian-portuguese. Now to find the related tasks:
code{
- $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index ddb3b58..ad40e60 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -52,51 +52,20 @@ time-consuming and error-prone, the #{lb config}# command can be used to
create skeleton configuration folders.
Issuing #{lb config}# without any arguments creates a #{config/}#
-subdirectory which it populates with some default settings:
+subdirectory which it populates with some default settings, and a skeleton
+#{auto/}# subdirectory tree.
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
Using #{lb config}# without any arguments would be suitable for users who
need a very basic image, or who intend to later provide a more complete
-configuration via auto/config (see {Managing a
+configuration via #{auto/config}# (see {Managing a
configuration}#managing-a-configuration for details).
Normally, you will want to specify some options. For example, to include the
@@ -120,7 +89,7 @@ A full list of options is available in the #{lb_config}# man page.
3~lb-build The #{lb build}# command
-The #{lb build}# command reads in your configuration from the config/
+The #{lb build}# command reads in your configuration from the #{config/}#
directory. It then runs the lower level commands needed to build your Live
system.
@@ -141,10 +110,10 @@ initramfs-tools, used to generate an initramfs capable of booting live
systems, such as those created by live-build. This includes the Debian Live
ISOs, netboot tarballs, and USB stick images.
-At boot time it will look for read-only media containing a "/live" directory
-where a root filesystem (often a compressed filesystem image like squashfs)
-is stored. If found, it will create a writable environment, using aufs, for
-Debian like systems to boot from.
+At boot time it will look for read-only media containing a #{/live/}#
+directory where a root filesystem (often a compressed filesystem image like
+squashfs) is stored. If found, it will create a writable environment, using
+aufs, for Debian like systems to boot from.
More information on initial ramfs in Debian can be found in the Debian Linux
Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter
diff --git a/manual/en/index.html.in b/manual/en/index.html.in
index c5b3624..481e993 100644
--- a/manual/en/index.html.in
+++ b/manual/en/index.html.in
@@ -9,17 +9,17 @@
<h2>Debian Live Manual</h2>
<p>
- Please report errors, omissions, patches and suggestions to our mailinglist at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a> and read about <a href="html/about-manual.html#how-to-contribute">how to contribute</a> to the manual.
+ Please report errors, omissions, patches and suggestions to our mailinglist at <a href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a> and read about <a href="html/about-manual.en.html#how-to-contribute">how to contribute</a> to the manual.
</p>
<h3>Available Formats</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">multi page</a>, <a href="html/live-manual.html">single page</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 portrait</a>, <a href="pdf/live-manual.landscape-a4.pdf">A4 landscape</a>, <a href="pdf/live-manual.portrait-letter.pdf">letter portrait</a>, <a href="pdf/live-manual.landscape-letter.pdf">letter landscape</a></li>
- <li><a href="txt/live-manual.txt">Plain text</a></li>
+ <li><a href="epub/live-manual.en.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.en.html">multi page</a>, <a href="html/live-manual.en.html">single page</a></li>
+ <li><a href="odf/live-manual.en.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.en.pdf">A4 portrait</a>, <a href="pdf/live-manual.landscape-a4.en.pdf">A4 landscape</a>, <a href="pdf/live-manual.portrait-letter.en.pdf">letter portrait</a>, <a href="pdf/live-manual.landscape-letter.en.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.en.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index bdb8c91..89a2a6e 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-11-06
+ :published: 2011-11-07
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/es/index.html.in b/manual/es/index.html.in
index ccc51a1..460ad65 100644
--- a/manual/es/index.html.in
+++ b/manual/es/index.html.in
@@ -9,25 +9,25 @@
<h2>Manual de Debian Live</h2>
<p>
- Por favor, leer previamente <a
-href="html/about-manual.html#how-to-contribute">como contribuir</a> para
-conocer como reportar errores, omisiones, parches y sugerencias a este
-manual, utilizando la lista de correos <a
-href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>.
+ Please report errors, omissions, patches and suggestions to our mailinglist
+at <a
+href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
+and read about <a href="html/about-manual.en.html#how-to-contribute">how to
+contribute</a> to the manual.
</p>
<h3>Formatos Disponibles</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">una página por capítulo</a>, <a
-href="html/live-manual.html">todo el manual en una página</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 vertical</a>, <a
-href="pdf/live-manual.landscape-a4.pdf">A4 apaisado</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">Carta (letter) vertical</a>, <a
-href="pdf/live-manual.landscape-letter.pdf">Carta (letter) apaisado</a></li>
- <li><a href="txt/live-manual.txt">Texto sin formato</a></li>
+ <li><a href="epub/live-manual.en.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.en.html">multi page</a>, <a
+href="html/live-manual.en.html">single page</a></li>
+ <li><a href="odf/live-manual.en.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.en.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape-a4.en.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait-letter.en.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape-letter.en.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.en.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index 020278c..03d2bba 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Este programa es software libre: puede ser redistribuido y / o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3
@date:
- :published: 2011-11-06
+ :published: 2011-11-07
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/es/user_customization-contents.ssi b/manual/es/user_customization-contents.ssi
index 12aedef..8a71076 100644
--- a/manual/es/user_customization-contents.ssi
+++ b/manual/es/user_customization-contents.ssi
@@ -52,16 +52,15 @@ concreto. N. del T); Si se necesita realizar algún procesado de estos
ficheros ver la sección {Scripts gancho locales en
Live/chroot}#live-chroot-local-hooks
-Para incluir ficheros solamente hace falta añadirlos al directorio de
-configuración #{config/chroot_local-includes}#. Habrá una relación directa
-entre este directorio y el directorio raiz (#{/}#) del sistema en vivo. Por
-ejemplo, si se desea añadir un fichero para que sea el fichero
-#{/var/www/index.html}# del sistema en vivo se puede hacer lo siguiente:
+To include files, simply add them to your #{config/includes.chroot}#
+directory. This directory corresponds to the root directory (#{/}#) of the
+live system. For example, to add a file #{/var/www/index.html}# in the live
+system, use:
code{
-$ mkdir -p config/chroot_local-includes/var/www
-$ cp /donde/esté/el/fichero/original/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -71,7 +70,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -86,20 +85,17 @@ que los paquetes puedan haber instalado.
3~binary-local-includes Includes locales en Binary
-Se puede incluir material como documentación, videos, etc en el sistema de
-ficheros del medio de instalación (USB, CDROM, etc) donde se grabará la
-imagen de manera que sea accesible nada más insertar el medio sin necesidad
-de arrancar el sistema en vivo. Para esto se utilizan los includes locales
-en Binary. Funciona de manera similar a los includes locales en chroot
-comentados anteriormente. Por ejemplo, supongamos que en el medio de
-instalación se desea añadir unos ficheros con videos de demostración sobre
-el funcionamiento del sistema en vivo de manera que el usuario pueda acceder
-a ellos a través de la página de indice HTML. Simplemente se debe copiar el
-material en #{config/binary_local-includes/}# de la siguiente manera:
+To include material such as documentation or videos on the media filesystem
+so that it is accessible immediately upon insertion of the media without
+booting the Live system, you can use binary local includes. This works in a
+similar fashion to chroot local includes. For example, suppose the files
+#{~/video_demo.*}# are demo videos of the live system described by and
+linked to by an HTML index page. Simply copy the material to
+#{config/includes.binary/}# as follows:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -144,17 +140,14 @@ simbólico en el directorio de configuración #{config/chroot_local-hooks}#.
3~boot-time-hooks Scripts gancho en tiempo de arranque
-Para ejecutar ordenes en el arranque del sistema en vivo, se puede
-suministrar scripts gancho a live-config depositándolos en el directorio
-#{config/chroot_local-includes/lib/live/config/}#, tal y como se explica en
-la sección de "Personalización" de la página de manual de live-config. Es
-interesante examinar los scripts gancho que trae de serie live-config que
-pueden verse en #{/lib/live/config/}# y fijarse en la secuencia de
-números. Cuando se vaya a utilizar scripts propios deben ser prefijados con
-un número para indicar el orden de ejecución. Otra posibilidad es utilizar
-un paquete personalizado tal y como se describe en {Instalar paquetes de
-terceros o paquetes
-modificados}#installing-modified-or-third-party-packages.
+To execute commands at boot time, you can supply live-config hooks as
+explained in the "Customization" section of its man page. Examine
+live-config's own hooks provided in #{/lib/live/config/}#, noting the
+sequence numbers. Then provide your own hook prefixed with an appropriate
+sequence number, either as a chroot local include in
+#{config/includes.chroot/lib/live/config/}#, or as a custom package as
+discussed in {Installing modified or third-party
+packages}#installing-modified-or-third-party-packages.
3~ Scripts gancho locales en Binary
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index 8253992..454535e 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -508,7 +508,7 @@ utilizar la siguiente opción:
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -553,11 +553,10 @@ y #{aptitude}#.
3~apt-pinning APT pinning
-Como información básica, sería recomendable leer la página de manual
-#{apt_preferences(5)}#. APT pinning puede ser configurado o en tiempo de
-creación de la imagen, creando el fichero #{config/chroot_apt/preferences}#
-o en tiempo de ejecución del sistema en vivo creando el fichero
-#{config/chroot_local-includes/etc/apt/preferences}#.
+For background, please first read the #{apt_preferences(5)}# man page. APT
+pinning can be configured either for build time, or else for run time. For
+the former, create #{config/chroot_apt/preferences}#. For the latter, create
+#{config/includes.chroot/etc/apt/preferences}#.
Supongamos que se está creando un sistema en vivo basado en Squeeze pero se
necesita instalar todos los paquetes "live" que terminan instalados en la
diff --git a/manual/es/user_customization-runtime.ssi b/manual/es/user_customization-runtime.ssi
index 7c1c9a5..46bbb92 100644
--- a/manual/es/user_customization-runtime.ssi
+++ b/manual/es/user_customization-runtime.ssi
@@ -43,12 +43,11 @@ $ lb config --bootappend-live "username=live-user"
}code
-Una posible forma de cambiar la contraseña por defecto es usando un script
-gancho (hook) tal y como se describe en {Scripts gancho en tiempo de
-arranque}#boot-time-hooks. Para conseguirlo se puede usar el script gancho
-«passwd» de #{/usr/share/doc/live-config/examples/hooks}#, ponerle un
-prefijo adecuado (p.ej. 200-passwd) y añadirlo a
-#{config/chroot_local-includes/lib/live/config/}#
+One possible way of changing the default password is by means of a hook as
+described in {Boot-time hooks}#boot-time-hooks. In order to do that you can
+use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#,
+prefix it accordingly (e.g. 200-passwd) and add it to
+#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Personalización de las variantes locales e
idioma
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index fb16c04..c3b7d2f 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -142,7 +142,7 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
+ --linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -156,13 +156,12 @@ code{
}code
-En primer lugar con #{--architecture i386}# se asegura de que en nuestro
-sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para
-ser usada en la mayoría de máquinas. En segundo lugar, se usa
-#{--linux-flavours 686}# porque no se espera usar esta imagen en sistemas
-mucho más viejos. En tercer lugar se elige la lista de paquetes #{lxde}#
-para proporcionar un escritorio mínimo. Y, por último, se añaden dos
-paquetes iniciales favoritos: #{iceweasel}# y #{xchat}#.
+First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+we build a 32-bit version suitable for use on most machines. Second, we use
+#{--linux-flavours 686-pae}# because we don't anticipate using this image on
+much older systems. Third, we've chosen the #{lxde}# package list to give us
+a minimal desktop. And finally, we have added two initial favourite
+packages: #{iceweasel}# and #{xchat}#.
Ahora, crear la imagen:
@@ -260,7 +259,7 @@ code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
$ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
@@ -273,8 +272,8 @@ el xvncviewer, conectándo al puerto #{5901}# de un servidor en
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat >config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -312,7 +311,7 @@ probable es que se produzca un sistema roto.
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
@@ -330,20 +329,19 @@ anterior produjo una imagen de 78Mbytes. Esto se compara favorablemente en
tamaño con la imagen de 166Mbytes producida por la configuración por defecto
en el {Tutorial 1}#tutorial-1.
-El mayor ahorro de espacio aquí, en comparación con la creación de una
-imagen estándar en un sistema de arquitectura #{i386}# es seleccionar sólo
-la versión del kernel #{486}# en lugar de la de por defecto #{-k "486
-686"}#. Dejar fuera los índices de APT con #{--binary-indices false}#
-también ahorra una cantidad importante de espacio, la desventaja es que es
-necesario hacer un #{apt-get update}# antes de usar apt en el sistema en
-vivo. Elegir la lista del paquete #{minimal}# deja fuera el gran paquete de
-#{locales}# y sus utilidades asociadas. Dejando los paquetes recomendados
-con #{--apt-recommends false}# se ahorra un poco de espacio adicional a
-costa de omitir algunos paquetes que de otro modo podría esperarse que
-estuvieran alli, tal como #{firmware-linux-free}# que puede ser necesario
-para el soporte de cierto hardware. Las opciones restantes recortan pequeñas
-cantidades adicionales de espacio. Es necesario decidir si vale la pena la
-funcionalidad que se sacrifica con cada optimización.
+The biggest space-saver here, compared to building a standard image on an
+#{i386}# architecture system, is to select only the #{486}# kernel flavour
+instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
+#{--apt-indices false}# also saves a fair amount of space, the tradeoff
+being that you need to #{apt-get update}# before using apt in the live
+system. Choosing the #{minimal}# package list leaves out the large
+#{locales}# package and associated utilities. Dropping recommended packages
+with #{--apt-recommends false}# saves some additional space, at the expense
+of omitting some packages you might otherwise expect to be there, such as
+#{firmware-linux-free}# which may be needed to support certain hardware. The
+remaining options shave off additional small amounts of space. It's up to
+you to decide if the functionality that is sacrificed with each optimization
+is worth the loss in functionality.
2~ Un escritorio KDE con variante local e instalador
@@ -370,12 +368,8 @@ Ahora podemos buscar las tareas apropiadas, primero con:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
@@ -384,14 +378,9 @@ brazilian-portuguese. Ahora para encontrar las tareas relacionas:
code{
-$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
diff --git a/manual/es/user_overview.ssi b/manual/es/user_overview.ssi
index 869ef06..f8d2fa5 100644
--- a/manual/es/user_overview.ssi
+++ b/manual/es/user_overview.ssi
@@ -55,53 +55,22 @@ live-build obtienen su configuración desde un único directorio llamado
propenso a errores, se puede utilizar el comando #{lb config}# para crear el
esqueleto de directorios de configuración.
-Ejecutar #{lb config}# sin argumentos crea un subdirectorio #{config/}# que
-se completa con algunas opciones por defecto:
+Issuing #{lb config}# without any arguments creates a #{config/}#
+subdirectory which it populates with some default settings, and a skeleton
+#{auto/}# subdirectory tree.
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
-Usar #{lb config}# sin ningún argumento sería conveniente para los usuarios
-que necesitan una imagen muy básica, o que tienen intención de proporcionar
-más tarde una configuración más completa a través de auto/config (ver
-{Gestionar una configuración}#managing-a-configuration para más detalles).
+Using #{lb config}# without any arguments would be suitable for users who
+need a very basic image, or who intend to later provide a more complete
+configuration via #{auto/config}# (see {Managing a
+configuration}#managing-a-configuration for details).
Normalmente, se tendrá que especificar algunas opciones. Por ejemplo, para
incluir la lista del paquete 'gnome' en la configuración:
@@ -125,9 +94,9 @@ Una lista completa de opciones está disponible en la página del manual
3~lb-build El comando #{lb build}#
-El comando #{lb build}# lee la configuración del directorio config/ A
-continuación, ejecuta los comandos del nivel inferior más bajo necesarios
-para crear el sistema en vivo.
+The #{lb build}# command reads in your configuration from the #{config/}#
+directory. It then runs the lower level commands needed to build your Live
+system.
3~lb-clean El comando #{lb clean}#
@@ -148,11 +117,10 @@ arrancar los sistemas en vivo, tales como los creados por live-build. Ésto
incluye las ISOs de Debian Live, archivos comprimidos en tar de netboot, e
imágenes para llaves USB.
-En el momento del arranque, buscará en los medios de almacenamiento de sólo
-lectura un directorio "/ live" donde se encuentra un sistema de ficheros
-raíz (a menudo una imagen del sistema de ficheros comprimidos como
-squashfs). Si lo encuentra, creará un entorno de escritura, utilizando aufs,
-para que arranquen los sistemas tipo Debian.
+At boot time it will look for read-only media containing a #{/live/}#
+directory where a root filesystem (often a compressed filesystem image like
+squashfs) is stored. If found, it will create a writable environment, using
+aufs, for Debian like systems to boot from.
Se puede encontrar más información sobre ramfs inicial en Debian en el
Manual del kernel Debian Linux en http://kernel-handbook.alioth.debian.org/
diff --git a/manual/fr/index.html.in b/manual/fr/index.html.in
index 268e942..849a896 100644
--- a/manual/fr/index.html.in
+++ b/manual/fr/index.html.in
@@ -9,25 +9,25 @@
<h2>Manuel Debian Live</h2>
<p>
- Veuillez transmettre les erreurs, omissions, patches et suggestions sur
-notre liste de discussion <a
+ Please report errors, omissions, patches and suggestions to our mailinglist
+at <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-et lire <a href="html/about-manual.html#how-to-contribute">comment
-contribuer</a> au manuel.
+and read about <a href="html/about-manual.en.html#how-to-contribute">how to
+contribute</a> to the manual.
</p>
<h3>Formats disponibles</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">multi pages</a>, <a
-href="html/live-manual.html">page unique</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 portrait</a>, <a
-href="pdf/live-manual.landscape-a4.pdf">A4 paysage</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">US portrait</a>, <a
-href="pdf/live-manual.landscape-letter.pdf">US paysage</a></li>
- <li><a href="txt/live-manual.txt">Texte brut</a></li>
+ <li><a href="epub/live-manual.en.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.en.html">multi page</a>, <a
+href="html/live-manual.en.html">single page</a></li>
+ <li><a href="odf/live-manual.en.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.en.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape-a4.en.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait-letter.en.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape-letter.en.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.en.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 3a9bcf3..fdb2614 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Ce programme est un logiciel libre; vous pouvez le redistribuer ou le modifier suivant les termes de la Licence Générale Publique GNU telle que publiée par la Free Software Foundation: soit la version 3 de cette licence, soit (à votre gré) toute version ultérieure.<br><br>Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE: sans même la garantie implicite de COMMERCIALISABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.<br><br>Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez http://www.gnu.org/licenses/. <br><br>Le texte complet de la Licence Générale Publique GNU peut être trouvé dans le fichier / usr/share/common-licenses/GPL-3
@date:
- :published: 2011-11-06
+ :published: 2011-11-07
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index 8d8a735..328c324 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -47,15 +47,15 @@ est de fournir des fichiers de configuration qui peuvent être simplement
ajoutés ou remplacés à l'image sans traitement, voir {Live/chroot local
hooks}#live-chroot-local-hooks si le traitement est nécessaire.
-Pour inclure des fichiers, il suffit de les ajouter à votre répertoire
-#{config/chroot_local-includes}#. Ce répertoire correspond au répertoire
-racine (#{/}#) du système live. Par exemple, pour ajouter un fichier
-#{/var/www/index.html}# dans le système live, utilisez:
+To include files, simply add them to your #{config/includes.chroot}#
+directory. This directory corresponds to the root directory (#{/}#) of the
+live system. For example, to add a file #{/var/www/index.html}# in the live
+system, use:
code{
- $ mkdir -p config/chroot_local-includes/var/www
- $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -65,7 +65,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -79,18 +79,17 @@ sorte que les fichiers installés par les paquets sont écrasés.
3~binary-local-includes Binary local includes
-Pour inclure des matériels tels que des documents ou des vidéos sur le
-système de fichiers des supports, afin qu'il soit accessible dès l'insertion
-du support sans avoir à démarrer le système live, vous pouvez utiliser
-binary local includes. Cela fonctionne de façon similaire aux chroot local
-includes. Par exemple, supposons que les fichiers #{~/video_demo.*}# sont
-des vidéos de démonstration du système live décrit par et lié par une page
-d'index HTML. Copiez simplement le matériel à
-#{config/binary_local-includes/}# comme suit:
+To include material such as documentation or videos on the media filesystem
+so that it is accessible immediately upon insertion of the media without
+booting the Live system, you can use binary local includes. This works in a
+similar fashion to chroot local includes. For example, suppose the files
+#{~/video_demo.*}# are demo videos of the live system described by and
+linked to by an HTML index page. Simply copy the material to
+#{config/includes.binary/}# as follows:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -132,14 +131,14 @@ pour les utiliser dans votre propre configuration.
3~boot-time-hooks Hooks au moment du démarrage
-Pour exécuter des commandes au moment du démarrage, vous pouvez fournir
-live-config hooks comme expliqué dans la section "Personnalisation" de sa
-page de manuel. Examiner les hooks de live-config fournis dans
-#{/lib/live/config/}#, en notant les numéros de séquence. Puis fournir votre
-propre hook préfixée avec un numéro de séquence appropriée, soit comme un
-chroot local include dans #{config/chroot_local-includes/lib/live/config/}#,
-ou comme un paquet personnalisé tel que discuté dans {Installation des
-paquets modifiés ou de tiers}#installing-modified-or-third-party-packages.
+To execute commands at boot time, you can supply live-config hooks as
+explained in the "Customization" section of its man page. Examine
+live-config's own hooks provided in #{/lib/live/config/}#, noting the
+sequence numbers. Then provide your own hook prefixed with an appropriate
+sequence number, either as a chroot local include in
+#{config/includes.chroot/lib/live/config/}#, or as a custom package as
+discussed in {Installing modified or third-party
+packages}#installing-modified-or-third-party-packages.
3~ Binary local hooks
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 1fcfd3f..c204ed7 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -499,7 +499,7 @@ pouvez omettre avec:
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -542,11 +542,10 @@ détails
3~apt-pinning APT pinning
-Pour le contexte, s'il vous plaît lire d'abord la page de manuel
-#{apt_preferences(5)}#. APT pinning peut être configuré soit pour le temps
-de construction, ou encore pendant l'exécution. Pour le premier, créez
-#{config/chroot_apt/preferences}#. Pour ce dernier, créez
-#{config/chroot_local-includes/etc/apt/preferences}#.
+For background, please first read the #{apt_preferences(5)}# man page. APT
+pinning can be configured either for build time, or else for run time. For
+the former, create #{config/chroot_apt/preferences}#. For the latter, create
+#{config/includes.chroot/etc/apt/preferences}#.
Imaginons que vous voulez construire un système live Squeeze mais il faut
installer tous les paquets live qui finissent dans l'image binaire depuis
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index f2f919e..2f4a1d8 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -41,12 +41,11 @@ $ lb config --bootappend-live "username=live-user"
}code
-Une façon possible de changer le mot de passe par défaut est au moyen d'un
-hook comme décrit dans {Hooks au moment du démarrage}#boot-time-hooks. Pour
-ce faire vous pouvez utiliser le hook "passwd" de
-#{/usr/share/doc/live-config/examples/hooks}#, ajouter un préfixe correct
-(par exemple 200-passwd) et l'ajouter à
-#{config/chroot_local-includes/lib/live/config/}#
+One possible way of changing the default password is by means of a hook as
+described in {Boot-time hooks}#boot-time-hooks. In order to do that you can
+use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#,
+prefix it accordingly (e.g. 200-passwd) and add it to
+#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Personnalisation des paramètres régionaux
et la langue
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 29b0b59..e4b0a22 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -142,7 +142,7 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
+ --linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -156,14 +156,12 @@ code{
}code
-Tout d'abord, #{--architecture i386}# assure que sur notre système de
-construction #{amd64}#, nous construisons une version 32 bits qui peut être
-utilisé sur la plupart des machines. Deuxièmement, nous utilisons
-#{--linux-flavours 686}# parce que nous ne prévoyons pas utiliser cette
-image sur des systèmes beaucoup plus anciens. Troisièmement, nous avons
-choisi la liste des paquets #{lxde}# pour nous donner un bureau minimal. Et
-enfin, nous avons ajouté deux premiers paquets préférés: #{iceweasel}# et
-#{xchat}#.
+First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+we build a 32-bit version suitable for use on most machines. Second, we use
+#{--linux-flavours 686-pae}# because we don't anticipate using this image on
+much older systems. Third, we've chosen the #{lxde}# package list to give us
+a minimal desktop. And finally, we have added two initial favourite
+packages: #{iceweasel}# and #{xchat}#.
Maintenant, construire l'image:
@@ -260,7 +258,7 @@ code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
$ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
@@ -272,8 +270,8 @@ reliant le port #{5901}# sur un serveur à #{192.168.1.2}#:
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat >config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -311,7 +309,7 @@ priorité #{importants}# produira probablement un système live cassé.
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
@@ -329,21 +327,19 @@ ci-dessus produit une image de 78Mbyte. Cela se compare favorablement avec
l'image de 166Mbyte produite par la configuration par défaut dans {Tutoriel
1}#tutorial-1.
-Le plus grand espace-économiseur ici, par rapport à la construction d'une
-image standard sur une architecture #{i386}#, est de sélectionner uniquement
-le saveur du noyau #{486}# au lieu de la valeur par défaut #{-k "486
-686"}#. Laissant hors indices APT avec #{--binary-indices false}# permet
-aussi d'économiser une bonne quantité d'espace, le compromis étant que vous
-devez faire #{apt-get update}# avant d'utiliser apt dans le système
-live. Le choix de la liste #{minimal}# laisse de côté les grands paquets de
-#{locales}# et les services associés. Laissant hors les paquets recommandés
-économise de l'espace supplémentaire, au détriment d'omettre certains
-paquets vous pourriez autrement s'attendre à être là, tel que
-#{firmware-linux-free}# qui peuvent être nécessaires pour prise en charge
-matérielle de certains supports matériels. Les options restantes économisent
-petites quantités d'espace supplémentaires. C'est à vous de décider si la
-fonctionnalité qui est sacrifié avec chaque optimisation est en vaut la
-perte de fonctionnalité.
+The biggest space-saver here, compared to building a standard image on an
+#{i386}# architecture system, is to select only the #{486}# kernel flavour
+instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
+#{--apt-indices false}# also saves a fair amount of space, the tradeoff
+being that you need to #{apt-get update}# before using apt in the live
+system. Choosing the #{minimal}# package list leaves out the large
+#{locales}# package and associated utilities. Dropping recommended packages
+with #{--apt-recommends false}# saves some additional space, at the expense
+of omitting some packages you might otherwise expect to be there, such as
+#{firmware-linux-free}# which may be needed to support certain hardware. The
+remaining options shave off additional small amounts of space. It's up to
+you to decide if the functionality that is sacrificed with each optimization
+is worth the loss in functionality.
2~ Un bureau KDE localisé et installateur
@@ -370,12 +366,8 @@ Maintenant, nous pouvons rechercher les tâches appropriées, d'abord avec:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
@@ -384,14 +376,9 @@ brazilian-portuguese. Maintenant, pour trouver les tâches liées:
code{
- $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
diff --git a/manual/fr/user_overview.ssi b/manual/fr/user_overview.ssi
index 1c09740..a4e595e 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -56,54 +56,22 @@ répertoire à la main serait fastidieux et source d'erreurs, la commande #{lb
config}# peut être utilisée pour créer des répertoires de configuration de
squelette.
-Exécuter #{lb config}# sans aucun argument crée un sous-répertoire
-#{config/}# dont il remplit avec certains paramètres par défaut:
+Issuing #{lb config}# without any arguments creates a #{config/}#
+subdirectory which it populates with some default settings, and a skeleton
+#{auto/}# subdirectory tree.
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
-L'utilisation de #{lb config}# sans aucun argument serait approprié pour les
-utilisateurs qui ont besoin d'une image de base, ou qui ont l'intention
-d'offrir plus tard, une configuration plus complète via auto/config (voir
-{Gestion d'une configuration}#managing-a-configuration pour plus de
-détails).
+Using #{lb config}# without any arguments would be suitable for users who
+need a very basic image, or who intend to later provide a more complete
+configuration via #{auto/config}# (see {Managing a
+configuration}#managing-a-configuration for details).
Normalement, vous voulez spécifier certaines options. Par exemple, pour
inclure la liste du paquet «gnome» dans votre configuration:
@@ -127,9 +95,9 @@ Une liste complète des options est disponible dans la page de manuel de
3~lb-build La commande #{lb build}#
-La commande #{lb build}# lit dans votre configuration à partir du répertoire
-config/. Il exécute alors les commandes de niveau inférieur nécessaires pour
-construire votre système Live.
+The #{lb build}# command reads in your configuration from the #{config/}#
+directory. It then runs the lower level commands needed to build your Live
+system.
3~lb-clean La commande #{lb clean}#
@@ -149,11 +117,10 @@ initramfs-tools, utilisé pour générer un initramfs capable de démarrer des
systèmes live, comme ceux créés par live-build. Cela inclut les ISOs de
Debian Live, netboot tarballs, et les images clé USB.
-Au démarrage il va chercher un support en lecture seule qui contient un
-répertoire «/live» où un système de fichiers racine (souvent une image de
-système de fichiers compressé comme squashfs) est stocké. S'il est trouvé,
-il va créer un environnement accessible en écriture, en utilisant aufs, afin
-que systémes similaires à Debian puissent démarrer à partir de ça.
+At boot time it will look for read-only media containing a #{/live/}#
+directory where a root filesystem (often a compressed filesystem image like
+squashfs) is stored. If found, it will create a writable environment, using
+aufs, for Debian like systems to boot from.
Plus d'information sur ramfs initial dans Debian peut être trouvé dans le
Debian Linux Kernel Handbook à http://kernel-handbook.alioth.debian.org/
diff --git a/manual/it/index.html.in b/manual/it/index.html.in
index c52644f..77b81b0 100644
--- a/manual/it/index.html.in
+++ b/manual/it/index.html.in
@@ -9,25 +9,25 @@
<h2>Manuale Debian Live</h2>
<p>
- Si prega di segnalare errori, omissioni, patch e suggerimenti sulla nostra
-mailing list <a
+ Please report errors, omissions, patches and suggestions to our mailinglist
+at <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-e leggere <a href="html/about-manual.html#how-to-contribute">come
-contribuire</a> al manuale.
+and read about <a href="html/about-manual.en.html#how-to-contribute">how to
+contribute</a> to the manual.
</p>
<h3>Formati disponibili</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">multi-pagina</a>, <a
-href="html/live-manual.html">pagina unica</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 verticale</a>, <a
-href="pdf/live-manual.landscape-a4.pdf">A4 orizzontale</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">lettera verticale</a>, <a
-href="pdf/live-manual.landscape-letter.pdf">lettera orizzontale</a></li>
- <li><a href="txt/live-manual.txt">Testo semplice</a></li>
+ <li><a href="epub/live-manual.en.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.en.html">multi page</a>, <a
+href="html/live-manual.en.html">single page</a></li>
+ <li><a href="odf/live-manual.en.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.en.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape-a4.en.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait-letter.en.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape-letter.en.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.en.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 30a696a..6c275d3 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2011-11-06
+ :published: 2011-11-07
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/user_customization-contents.ssi b/manual/it/user_customization-contents.ssi
index f1a1ce6..1cc9bfa 100644
--- a/manual/it/user_customization-contents.ssi
+++ b/manual/it/user_customization-contents.ssi
@@ -43,15 +43,15 @@ possono essere semplicemente aggiunti o sostituiti nell'immagine senza
elaborazione; si veda {Live/chroot hook locali}#live-chroot-local-hooks se è
necessaria l'elaborazione.
-Per includere i file si aggiungano semplicemente alla directory
-#{config/chroot_local-includes}#. Questa corrisponde alla directory root
-(#{/}#) del sistema live. Per esempio, per aggiungere un file
-#{/var/www/index.html}# nel sistema live, si usi:
+To include files, simply add them to your #{config/includes.chroot}#
+directory. This directory corresponds to the root directory (#{/}#) of the
+live system. For example, to add a file #{/var/www/index.html}# in the live
+system, use:
code{
- $ mkdir -p config/chroot_local-includes/var/www
- $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -61,7 +61,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -75,17 +75,17 @@ pacchetti in modo che tali file vengano in seguito sovrascitti.
3~binary-local-includes Include locali binari
-Si possono utilizzare include locali binari per inserire sul filesystem del
-supporto materiale come documentazione o video affinché sia immediatamente
-accessibile dopo l'inserimento dello stesso senza avviare il sistema
-live. Ciò funziona in modo simile agli include locali del chroot; supponendo
-che i file #{~/video_demo.*}# siano video dimostrativi del sistema descritti
-da e collegati a una pagina HTML indice, basta copiare il materiale in
-#{config/binary_local-includes/}# come segue:
+To include material such as documentation or videos on the media filesystem
+so that it is accessible immediately upon insertion of the media without
+booting the Live system, you can use binary local includes. This works in a
+similar fashion to chroot local includes. For example, suppose the files
+#{~/video_demo.*}# are demo videos of the live system described by and
+linked to by an HTML index page. Simply copy the material to
+#{config/includes.binary/}# as follows:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -126,14 +126,14 @@ propria configurazione.
3~boot-time-hooks Hook in fase di avvio
-Per eseguire comandi all'avvio, è possibile fornire degli hook a live-config
-come spiegato nella sezione "Customization" del suo manuale. Controllare gli
-hook di live-config in #{/lib/live/config/}# e notare i numeri sequenziali;
-fornire quindi i propri hook con una sequenza numerica appropriata, sia come
-include locali del chroot in
-#{config/chroot_local-includes/lib/live/config/}#, sia come pacchetto
-personalizzato come discusso in {Installare pacchetti modificati o di terze
-parti}#installing-modified-or-third-party-packages.
+To execute commands at boot time, you can supply live-config hooks as
+explained in the "Customization" section of its man page. Examine
+live-config's own hooks provided in #{/lib/live/config/}#, noting the
+sequence numbers. Then provide your own hook prefixed with an appropriate
+sequence number, either as a chroot local include in
+#{config/includes.chroot/lib/live/config/}#, or as a custom package as
+discussed in {Installing modified or third-party
+packages}#installing-modified-or-third-party-packages.
3~ Hook binari locali
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index b0ed06b..d98e4cb 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -472,7 +472,7 @@ d'interesse.
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -512,10 +512,10 @@ di #{apt}# e #{aptitude}# per i dettagli.
3~apt-pinning APT pinning
-Si prega di leggere prima il manuale di #{apt_preferences(5)}#. Il pinning
-può essere configurato sia in fase di costruzione sia di esecuzione; per la
-prima creare #{config/chroot_apt/preferences}#, per quest'ultima creare
-#{config/chroot_local-includes/etc/apt/preferences}#.
+For background, please first read the #{apt_preferences(5)}# man page. APT
+pinning can be configured either for build time, or else for run time. For
+the former, create #{config/chroot_apt/preferences}#. For the latter, create
+#{config/includes.chroot/etc/apt/preferences}#.
Nell'ipotesi di creare un sistema live Squeeze e avendo la necessità di
installare da Sid tutti i pacchetti live destinati all'immagine binaria
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index 74095a0..6e8e620 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -44,7 +44,7 @@ One possible way of changing the default password is by means of a hook as
described in {Boot-time hooks}#boot-time-hooks. In order to do that you can
use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#,
prefix it accordingly (e.g. 200-passwd) and add it to
-#{config/chroot_local-includes/lib/live/config/}#
+#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Personalizzare la localizzazione e la
lingua
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index d675f5b..ef8044c 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -137,7 +137,7 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
+ --linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -151,13 +151,12 @@ code{
}code
-Per prima cosa, #{--architecture i386}# assicura che sul nostro sistema
-#{amd64}# costruiamo una versione a 32-bit utilizzabile sulla maggior parte
-delle macchine. In secondo luogo, usiamo #{--linux-flavours 686}# dato che
-non prevediamo di usare questa immagine su sistemi troppo vecchi. Terzo,
-abbiamo scelto la lista di pacchetti #{lxde}# per avere un desktop
-minimale. Infine, abbiamo aggiunto due pacchetti preferiti per cominciare:
-#{iceweasel}# e #{xchat}#.
+First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+we build a 32-bit version suitable for use on most machines. Second, we use
+#{--linux-flavours 686-pae}# because we don't anticipate using this image on
+much older systems. Third, we've chosen the #{lxde}# package list to give us
+a minimal desktop. And finally, we have added two initial favourite
+packages: #{iceweasel}# and #{xchat}#.
Costruire quindi l'immagine:
@@ -254,7 +253,7 @@ code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
$ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
@@ -267,8 +266,8 @@ xvncviewer, connesso alla porta #{5901}# su un server all'indirizzo
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat >config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -305,7 +304,7 @@ sappia cosa si sta facendo, come omettere la priorità dei pacchetti
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
@@ -322,19 +321,19 @@ All'autore del sistema al momento di scrivere, la seguente configurazione ha
prodotto una immagine di 78Mbyte. Comparabile favorevolmente con i 166Mbyte
prodotta dalla configurazione predefinita nel {Tutorial 1}#tutorial-1.
-Ciò che salva più spazio, comparato alla costruzione di un'immagine standard
-su un sistema con architettura #{i386}#, è la selezione del solo kernel
-#{486}# invece che quello predefinito #{-k "486 686"}#. Lasciando fuori
-anche gli indici di APT con #{--binary-indices false}# si può salvare una
-certa quantità di spazio, il compromesso è usare #{apt-get update}# prima di
-usare apt nel sistema live. Scegliendo la lista #{minima}# dei pacchetti si
-esclude il grosso pacchetto #{locales}# e le utilità associate. Saltare i
-pacchetti raccomandati con #{--apt-recommends false}# salva altro spazio, a
-scapito di alcuni pacchetti che ci si aspetta di trovare, come
-#{firmware-linux-free}# che potrebbe servire a supportare un certo
-hardware. Le restanti opzioni limano altre piccole quantità di spazio. Sta a
-voi decidere se le funzionalità sacrificate con ciascuna ottimizzazione
-valgono la pena.
+The biggest space-saver here, compared to building a standard image on an
+#{i386}# architecture system, is to select only the #{486}# kernel flavour
+instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
+#{--apt-indices false}# also saves a fair amount of space, the tradeoff
+being that you need to #{apt-get update}# before using apt in the live
+system. Choosing the #{minimal}# package list leaves out the large
+#{locales}# package and associated utilities. Dropping recommended packages
+with #{--apt-recommends false}# saves some additional space, at the expense
+of omitting some packages you might otherwise expect to be there, such as
+#{firmware-linux-free}# which may be needed to support certain hardware. The
+remaining options shave off additional small amounts of space. It's up to
+you to decide if the functionality that is sacrificed with each optimization
+is worth the loss in functionality.
2~ Un desktop KDE localizzato e l'installer
@@ -361,12 +360,8 @@ Ora si possono cercare i task appropriati:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
@@ -375,14 +370,9 @@ chiaramente, brazilian-portuguese. Ora per trovare i task correlati:
code{
- $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
diff --git a/manual/it/user_overview.ssi b/manual/it/user_overview.ssi
index a082cd4..9404a20 100644
--- a/manual/it/user_overview.ssi
+++ b/manual/it/user_overview.ssi
@@ -54,53 +54,22 @@ singola directory chiamata #{config/}#. Dal momento che crearla a mano
sarebbe dispendioso in termini di tempo e soggetto a errori, si può usare il
comando #{lb config}# per creare la directory scheletro di configurazione.
-L'esecuzione di #{lb config}# senza argomenti crea una sottodirectory di
-#{config/}# popolata con alcune impostazioni predefinite:
+Issuing #{lb config}# without any arguments creates a #{config/}#
+subdirectory which it populates with some default settings, and a skeleton
+#{auto/}# subdirectory tree.
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
-L'uso di #{lb config}# senza argomenti è adatto ad utenti che necessitano di
-un'immagine di base o che intendono fornire in seguito una configurazione
-più completa tramite auto/config (per i dettagli vedere {Gestire una
-configurazione}#managing-a-configuration).
+Using #{lb config}# without any arguments would be suitable for users who
+need a very basic image, or who intend to later provide a more complete
+configuration via #{auto/config}# (see {Managing a
+configuration}#managing-a-configuration for details).
Normalmente si vorranno specificare delle opzioni, ad esempio per includere
nella propria configurazione l'elenco del pacchetto "gnome":
@@ -123,9 +92,9 @@ Una lista completa delle opzioni è disponibile nel manuale di #{lb_config}#.
3~lb-build Il comando #{lb build}#
-Il comando #{lb build}# legge la configurazione dalla directory #{config/}#
-ed esegue ad un livello inferiore i comandi necessari a costruire il sistema
-live.
+The #{lb build}# command reads in your configuration from the #{config/}#
+directory. It then runs the lower level commands needed to build your Live
+system.
3~lb-clean Il comando #{lb clean}#
@@ -145,10 +114,10 @@ utilizzato per generare un initramfs in grado di avviare sistemi live, come
quelli creati da live-build. Questo include le ISO di Debian Live, archivi
per l'avvio da rete e immagini per penne USB.
-All'avvio cercherà supporti in sola lettura che contengano una directory
-"/live" dove sia presente un filesystem root (spesso un'immagine compressa
-come squashfs). Se trovata, creerà un ambiente scrivibile usando aufs, per
-avviarsi da sistemi simili a Debian.
+At boot time it will look for read-only media containing a #{/live/}#
+directory where a root filesystem (often a compressed filesystem image like
+squashfs) is stored. If found, it will create a writable environment, using
+aufs, for Debian like systems to boot from.
Si possono trovare maggiori informazioni sui ramfs iniziali nel capitolo su
initramfs del Debian Linux Kernel Handbook all'indirizzo
diff --git a/manual/po/de/index.html.in.po b/manual/po/de/index.html.in.po
index 697c4e9..e6ae1b2 100644
--- a/manual/po/de/index.html.in.po
+++ b/manual/po/de/index.html.in.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 3.0~a3-1\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -27,10 +27,16 @@ msgstr "Debian Live Handbuch"
#. type: Content of: <html><body><p>
#: en/index.html.in:12
+#, fuzzy
+#| msgid ""
+#| "Please report errors, omissions, patches and suggestions to our "
+#| "mailinglist at <a href=\"mailto:debian-live at lists.debian.org\">debian-"
+#| "live at lists.debian.org</a> and read about <a href=\"html/about-manual."
+#| "html#how-to-contribute\">how to contribute</a> to the manual."
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Fehler, Vergessenes, Patches und Vorschläge können an unsere Mailing Liste "
@@ -46,30 +52,44 @@ msgstr "Verfügbare Formate"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+#, fuzzy
+#| msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:19
+#, fuzzy
+#| msgid ""
+#| "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-"
+#| "manual.html\">single page</a>"
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
"HTML: <a href=\"html/index.html\">mehrere Seiten</a>, <a href=\"html/live-"
"manual.html\">einzelne Seite</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+#, fuzzy
+#| msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:21
+#, fuzzy
+#| msgid ""
+#| "PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
+#| "\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+#| "manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+#| "manual.landscape-letter.pdf\">letter landscape</a>"
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 Hochformat</a>, <a href="
"\"pdf/live-manual.landscape-a4.pdf\">A4 Querformat</a>, <a href=\"pdf/live-"
@@ -78,7 +98,9 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+#, fuzzy
+#| msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
msgstr "<a href=\"txt/live-manual.txt\">Text</a>"
#. type: Content of: <html><body><p>
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 52ee3e6..d419695 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: 2011-11-06 12:40+0100\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-11-06\n"
+" :published: 2011-11-07\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index 56239ed..42e6222 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-08-25 15:56+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -102,49 +101,48 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -235,7 +233,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
@@ -245,8 +243,8 @@ msgstr ""
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
#. type: Plain text
@@ -260,7 +258,7 @@ msgstr ""
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -288,14 +286,14 @@ msgid ""
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
@@ -371,10 +369,9 @@ msgid ""
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 7bf7e27..0fb22b7 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -67,8 +67,8 @@ msgstr ""
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -132,8 +132,8 @@ msgstr ""
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -141,8 +141,8 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -939,7 +939,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
@@ -1006,7 +1006,7 @@ msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index b9ac446..3616bbb 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/de/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -102,49 +101,48 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -222,8 +220,8 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 94fb4af..2ccd840 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -72,8 +72,8 @@ msgstr ""
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -82,7 +82,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -137,8 +137,8 @@ msgstr ""
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -146,8 +146,8 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -375,7 +375,7 @@ msgstr ""
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
+" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
@@ -396,10 +396,10 @@ msgstr ""
msgid ""
"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
-"{--linux-flavours 686}# because we don't anticipate using this image on much "
-"older systems. Third, we've chosen the #{lxde}# package list to give us a "
-"minimal desktop. And finally, we have added two initial favourite packages: #"
-"{iceweasel}# and #{xchat}#."
+"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
+"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"a minimal desktop. And finally, we have added two initial favourite "
+"packages: #{iceweasel}# and #{xchat}#."
msgstr ""
#. type: Plain text
@@ -538,7 +538,7 @@ msgstr ""
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
@@ -555,8 +555,8 @@ msgstr ""
#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat >config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
@@ -615,7 +615,7 @@ msgstr ""
#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
@@ -637,8 +637,8 @@ msgstr ""
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
-"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
-"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-indices false}# also saves a fair amount of space, the tradeoff "
"being that you need to #{apt-get update}# before using apt in the live "
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
@@ -691,45 +691,31 @@ msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:276
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:280
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:284
+#: en/user_examples.ssi:275
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
"latin1 keyboard layout. We will also need to preseed our desktop choice, "
@@ -739,7 +725,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -756,7 +742,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:301
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index 3e777e3..1f1f5c7 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -76,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -100,38 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -139,8 +141,8 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -261,118 +263,77 @@ msgstr ""
#: en/user_overview.ssi:34
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:76
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -384,12 +345,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -398,16 +359,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -415,12 +376,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/es/index.html.in.po b/manual/po/es/index.html.in.po
index 323920d..161341c 100644
--- a/manual/po/es/index.html.in.po
+++ b/manual/po/es/index.html.in.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-03 18:22-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-03-12 05:53-0000\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -33,10 +33,16 @@ msgstr "Manual de Debian Live"
#. type: Content of: <html><body><p>
#: en/index.html.in:12
+#, fuzzy
+#| msgid ""
+#| "Please report errors, omissions, patches and suggestions to our "
+#| "mailinglist at <a href=\"mailto:debian-live at lists.debian.org\">debian-"
+#| "live at lists.debian.org</a> and read about <a href=\"html/about-manual."
+#| "html#how-to-contribute\">how to contribute</a> to the manual."
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Por favor, leer previamente <a href=\"html/about-manual.html#how-to-"
@@ -52,30 +58,44 @@ msgstr "Formatos Disponibles"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+#, fuzzy
+#| msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:19
+#, fuzzy
+#| msgid ""
+#| "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-"
+#| "manual.html\">single page</a>"
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
"HTML: <a href=\"html/index.html\">una página por capítulo</a>, <a href="
"\"html/live-manual.html\">todo el manual en una página</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+#, fuzzy
+#| msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:21
+#, fuzzy
+#| msgid ""
+#| "PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
+#| "\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+#| "manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+#| "manual.landscape-letter.pdf\">letter landscape</a>"
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 vertical</a>, <a href="
"\"pdf/live-manual.landscape-a4.pdf\">A4 apaisado</a>, <a href=\"pdf/live-"
@@ -84,7 +104,9 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+#, fuzzy
+#| msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
msgstr "<a href=\"txt/live-manual.txt\">Texto sin formato</a>"
#. type: Content of: <html><body><p>
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index 00f6903..f95c867 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-06 12:40+0100\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-03-12 08:00-0000\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com\n"
@@ -53,7 +53,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-11-06\n"
+" :published: 2011-11-07\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/user_customization-contents.ssi.po b/manual/po/es/user_customization-contents.ssi.po
index 46ee2d2..8d0c1ec 100644
--- a/manual/po/es/user_customization-contents.ssi.po
+++ b/manual/po/es/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-08-25 15:56+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-04-04 14:27+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -38,48 +38,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,49 +102,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -274,8 +272,14 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
+#, fuzzy
+#| msgid ""
+#| "To include files, simply add them to your #{config/chroot_local-includes}"
+#| "# directory. This directory corresponds to the root directory (#{/}#) of "
+#| "the live system. For example, to add a file #{/var/www/index.html}# in "
+#| "the live system, use:"
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
@@ -288,10 +292,13 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:29
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ mkdir -p config/chroot_local-includes/var/www\n"
+#| " $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
"$ mkdir -p config/chroot_local-includes/var/www\n"
"$ cp /donde/esté/el/fichero/original/index.html config/chroot_local-includes/var/www\n"
@@ -303,11 +310,20 @@ msgstr "El directorio de configuración presentará la siguiente jerarquía:"
#. type: Plain text
#: en/user_customization-contents.ssi:44
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " -- config\n"
+#| " [...]\n"
+#| " |-- chroot_local-includes\n"
+#| " | `-- var\n"
+#| " | `-- www\n"
+#| " | `-- index.html\n"
+#| " [...]\n"
+#| " `-- templates\n"
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -340,14 +356,23 @@ msgstr "3~binary-local-includes Includes locales en Binary "
#. type: Plain text
#: en/user_customization-contents.ssi:52
+#, fuzzy
+#| msgid ""
+#| "To include material such as documentation or videos on the media "
+#| "filesystem so that it is accessible immediately upon insertion of the "
+#| "media without booting the Live system, you can use binary local includes. "
+#| "This works in a similar fashion to chroot local includes. For example, "
+#| "suppose the files #{~/video_demo.*}# are demo videos of the live system "
+#| "described by and linked to by an HTML index page. Simply copy the "
+#| "material to #{config/binary_local-includes/}# as follows:"
msgid ""
"To include material such as documentation or videos on the media filesystem "
"so that it is accessible immediately upon insertion of the media without "
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
"Se puede incluir material como documentación, videos, etc en el sistema de "
"ficheros del medio de instalación (USB, CDROM, etc) donde se grabará la "
@@ -362,8 +387,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:56
-#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+#, fuzzy, no-wrap
+#| msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr " $ cp ~/video_demo.* config/binary_local-includes/\n"
#. type: Plain text
@@ -456,15 +482,24 @@ msgstr "3~boot-time-hooks Scripts gancho en tiempo de arranque"
#. type: Plain text
#: en/user_customization-contents.ssi:84
+#, fuzzy
+#| msgid ""
+#| "To execute commands at boot time, you can supply live-config hooks as "
+#| "explained in the \"Customization\" section of its man page. Examine live-"
+#| "config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
+#| "numbers. Then provide your own hook prefixed with an appropriate sequence "
+#| "number, either as a chroot local include in #{config/chroot_local-"
+#| "includes/lib/live/config/}#, or as a custom package as discussed in "
+#| "{Installing modified or third-party packages}#installing-modified-or-"
+#| "third-party-packages."
msgid ""
"To execute commands at boot time, you can supply live-config hooks as "
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
"Para ejecutar ordenes en el arranque del sistema en vivo, se puede "
"suministrar scripts gancho a live-config depositándolos en el directorio #"
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 033f732..535041a 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-11-06 16:17+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -74,8 +74,8 @@ msgstr ""
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -84,7 +84,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -139,8 +139,8 @@ msgstr "code{"
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -148,8 +148,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -1246,8 +1246,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:290
-#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+#, fuzzy, no-wrap
+#| msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr " $ lb config --binary-indices false\n"
#. type: Plain text
@@ -1337,11 +1338,17 @@ msgstr "3~apt-pinning APT pinning"
#. type: Plain text
#: en/user_customization-packages.ssi:312
+#, fuzzy
+#| msgid ""
+#| "For background, please first read the #{apt_preferences(5)}# man page. "
+#| "APT pinning can be configured either for build time, or else for run "
+#| "time. For the former, create #{config/chroot_apt/preferences}#. For the "
+#| "latter, create #{config/chroot_local-includes/etc/apt/preferences}#."
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
"Como información básica, sería recomendable leer la página de manual #"
"{apt_preferences(5)}#. APT pinning puede ser configurado o en tiempo de "
diff --git a/manual/po/es/user_customization-runtime.ssi.po b/manual/po/es/user_customization-runtime.ssi.po
index bf6ea21..2a45142 100644
--- a/manual/po/es/user_customization-runtime.ssi.po
+++ b/manual/po/es/user_customization-runtime.ssi.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-08-25 16:22+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -42,48 +42,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -107,49 +106,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -246,12 +244,19 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:30
+#, fuzzy
+#| msgid ""
+#| "One possible way of changing the default password is by means of a hook "
+#| "as described in {Boot-time hooks}#boot-time-hooks. In order to do that "
+#| "you can use the \"passwd\" hook from #{/usr/share/doc/live-config/"
+#| "examples/hooks}#, prefix it accordingly (e.g. 200-passwd) and add it to #"
+#| "{config/chroot_local-includes/lib/live/config/}#"
msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
"Una posible forma de cambiar la contraseña por defecto es usando un script "
"gancho (hook) tal y como se describe en {Scripts gancho en tiempo de "
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index 85477a8..b3ed880 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-11-06 16:42+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -77,8 +77,8 @@ msgstr ":B~ Ejemplos"
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -87,7 +87,7 @@ msgstr ":B~ Ejemplos"
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -142,8 +142,8 @@ msgstr "code{"
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -151,8 +151,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -445,11 +445,17 @@ msgstr " #!/bin/sh\n"
#. type: Plain text
#: en/user_examples.ssi:101
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " lb config noauto \\\n"
+#| " --architecture i386 \\\n"
+#| " --linux-flavours 686 \\\n"
+#| " --package-lists lxde \\\n"
+#| " \"${@}\"\n"
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
+" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
@@ -472,13 +478,21 @@ msgstr " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
#. type: Plain text
#: en/user_examples.ssi:113
+#, fuzzy
+#| msgid ""
+#| "First, #{--architecture i386}# ensures that on our #{amd64}# build "
+#| "system, we build a 32-bit version suitable for use on most machines. "
+#| "Second, we use #{--linux-flavours 686}# because we don't anticipate using "
+#| "this image on much older systems. Third, we've chosen the #{lxde}# "
+#| "package list to give us a minimal desktop. And finally, we have added two "
+#| "initial favourite packages: #{iceweasel}# and #{xchat}#."
msgid ""
"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
-"{--linux-flavours 686}# because we don't anticipate using this image on much "
-"older systems. Third, we've chosen the #{lxde}# package list to give us a "
-"minimal desktop. And finally, we have added two initial favourite packages: #"
-"{iceweasel}# and #{xchat}#."
+"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
+"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"a minimal desktop. And finally, we have added two initial favourite "
+"packages: #{iceweasel}# and #{xchat}#."
msgstr ""
"En primer lugar con #{--architecture i386}# se asegura de que en nuestro "
"sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para "
@@ -657,11 +671,17 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:187
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ mkdir vnc_kiosk_client\n"
+#| " $ cd vnc_kiosk_client\n"
+#| " $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+#| " --apt-recommends false\n"
+#| " $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
@@ -685,10 +705,14 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:197
-#, no-wrap
-msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ mkdir -p config/chroot_local-includes/etc/skel\n"
+#| " $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+#| " #!/bin/sh\n"
+msgid ""
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat >config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
" $ mkdir -p config/chroot_local-includes/etc/skel\n"
@@ -762,9 +786,12 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:226
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ lb config -k 486 -p minimal --binary-indices false \\\n"
+#| " --memtest none --apt-recommends false --includes none\n"
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
" $ lb config -k 486 -p minimal --binary-indices false \\\n"
@@ -789,11 +816,27 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:240
+#, fuzzy
+#| msgid ""
+#| "The biggest space-saver here, compared to building a standard image on an "
+#| "#{i386}# architecture system, is to select only the #{486}# kernel "
+#| "flavour instead of the default #{-k \"486 686\"}#. Leaving off APT's "
+#| "indices with #{--binary-indices false}# also saves a fair amount of "
+#| "space, the tradeoff being that you need to #{apt-get update}# before "
+#| "using apt in the live system. Choosing the #{minimal}# package list "
+#| "leaves out the large #{locales}# package and associated utilities. "
+#| "Dropping recommended packages with #{--apt-recommends false}# saves some "
+#| "additional space, at the expense of omitting some packages you might "
+#| "otherwise expect to be there, such as #{firmware-linux-free}# which may "
+#| "be needed to support certain hardware. The remaining options shave off "
+#| "additional small amounts of space. It's up to you to decide if the "
+#| "functionality that is sacrificed with each optimization is worth the loss "
+#| "in functionality."
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
-"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
-"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-indices false}# also saves a fair amount of space, the tradeoff "
"being that you need to #{apt-get update}# before using apt in the live "
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
@@ -869,25 +912,15 @@ msgid "Now we can search for the appropriate tasks, first with:"
msgstr "Ahora podemos buscar las tareas apropiadas, primero con:"
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
-" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
@@ -896,13 +929,17 @@ msgstr ""
"brazilian-portuguese. Ahora para encontrar las tareas relacionas: "
#. type: Plain text
-#: en/user_examples.ssi:276
-#, no-wrap
+#: en/user_examples.ssi:271
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+#| " Task: brazilian-portuguese-desktop\n"
+#| " Description: Brazilian Portuguese desktop\n"
+#| " This task localises the desktop in Brasilian Portuguese.\n"
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
+" Task: brazilian-portuguese-kde-desktop\n"
msgstr ""
"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
" Task: brazilian-portuguese-desktop\n"
@@ -910,19 +947,7 @@ msgstr ""
" This task localises the desktop in Brasilian Portuguese.\n"
#. type: Plain text
-#: en/user_examples.ssi:280
-#, no-wrap
-msgid ""
-" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
-msgstr ""
-" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
-
-#. type: Plain text
-#: en/user_examples.ssi:284
+#: en/user_examples.ssi:275
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
"latin1 keyboard layout. We will also need to preseed our desktop choice, "
@@ -938,7 +963,7 @@ msgstr ""
"vamos a poner las piezas juntas:"
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -966,7 +991,7 @@ msgstr ""
" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:301
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/es/user_overview.ssi.po b/manual/po/es/user_overview.ssi.po
index c69cd97..ebd9c8d 100644
--- a/manual/po/es/user_overview.ssi.po
+++ b/manual/po/es/user_overview.ssi.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-05-13 18:54+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -42,37 +42,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -81,7 +82,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -105,38 +106,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -144,8 +146,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -299,103 +301,39 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:34
+#, fuzzy
+#| msgid ""
+#| "Issuing #{lb config}# without any arguments creates a #{config/}# "
+#| "subdirectory which it populates with some default settings:"
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
"Ejecutar #{lb config}# sin argumentos crea un subdirectorio #{config/}# que "
"se completa con algunas opciones por defecto:"
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
-" $ lb config\n"
-" P: Creating config tree\n"
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-
-#. type: Plain text
-#: en/user_overview.ssi:76
+#, fuzzy
+#| msgid ""
+#| "Using #{lb config}# without any arguments would be suitable for users who "
+#| "need a very basic image, or who intend to later provide a more complete "
+#| "configuration via auto/config (see {Managing a configuration}#managing-a-"
+#| "configuration for details)."
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
"Usar #{lb config}# sin ningún argumento sería conveniente para los usuarios "
@@ -404,7 +342,7 @@ msgstr ""
"{Gestionar una configuración}#managing-a-configuration para más detalles)."
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
@@ -413,38 +351,43 @@ msgstr ""
"incluir la lista del paquete 'gnome' en la configuración:"
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr " $ lb config -p gnome\n"
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr "Es posible especificar muchas opciones, tales como:"
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
"Una lista completa de opciones está disponible en la página del manual #"
"{lb_config}#."
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr "3~lb-build El comando #{lb build}#"
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
+#, fuzzy
+#| msgid ""
+#| "The #{lb build}# command reads in your configuration from the config/ "
+#| "directory. It then runs the lower level commands needed to build your "
+#| "Live system."
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
@@ -453,12 +396,12 @@ msgstr ""
"para crear el sistema en vivo."
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr "3~lb-clean El comando #{lb clean}#"
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -478,12 +421,12 @@ msgstr ""
"opciones"
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr "2~live-boot El paquete live-boot"
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -497,9 +440,15 @@ msgstr ""
"imágenes para llaves USB."
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
+#, fuzzy
+#| msgid ""
+#| "At boot time it will look for read-only media containing a \"/live\" "
+#| "directory where a root filesystem (often a compressed filesystem image "
+#| "like squashfs) is stored. If found, it will create a writable "
+#| "environment, using aufs, for Debian like systems to boot from."
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
@@ -511,7 +460,7 @@ msgstr ""
"para que arranquen los sistemas tipo Debian."
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -522,12 +471,12 @@ msgstr ""
"concretamente en el capítulo sobre initramfs."
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr "2~live-config El paquete live-config"
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/fr/index.html.in.po b/manual/po/fr/index.html.in.po
index cb9f9d3..a27766d 100644
--- a/manual/po/fr/index.html.in.po
+++ b/manual/po/fr/index.html.in.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-03 18:22-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-12-08 16:13+0100\n"
"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -28,10 +28,16 @@ msgstr "Manuel Debian Live"
#. type: Content of: <html><body><p>
#: en/index.html.in:12
+#, fuzzy
+#| msgid ""
+#| "Please report errors, omissions, patches and suggestions to our "
+#| "mailinglist at <a href=\"mailto:debian-live at lists.debian.org\">debian-"
+#| "live at lists.debian.org</a> and read about <a href=\"html/about-manual."
+#| "html#how-to-contribute\">how to contribute</a> to the manual."
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Veuillez transmettre les erreurs, omissions, patches et suggestions sur "
@@ -46,30 +52,44 @@ msgstr "Formats disponibles"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+#, fuzzy
+#| msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:19
+#, fuzzy
+#| msgid ""
+#| "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-"
+#| "manual.html\">single page</a>"
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
"HTML: <a href=\"html/index.html\">multi pages</a>, <a href=\"html/live-"
"manual.html\">page unique</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+#, fuzzy
+#| msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:21
+#, fuzzy
+#| msgid ""
+#| "PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
+#| "\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+#| "manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+#| "manual.landscape-letter.pdf\">letter landscape</a>"
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
"\"pdf/live-manual.landscape-a4.pdf\">A4 paysage</a>, <a href=\"pdf/live-"
@@ -78,7 +98,9 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+#, fuzzy
+#| msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
msgstr "<a href=\"txt/live-manual.txt\">Texte brut</a>"
#. type: Content of: <html><body><p>
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 3187dc9..bea90cf 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-06 12:40+0100\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-06-19 16:32+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-11-06\n"
+" :published: 2011-11-07\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index fbd7b15..cbd695d 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 15:56+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-07-30 17:55+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -38,48 +38,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,49 +102,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -268,8 +266,14 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
+#, fuzzy
+#| msgid ""
+#| "To include files, simply add them to your #{config/chroot_local-includes}"
+#| "# directory. This directory corresponds to the root directory (#{/}#) of "
+#| "the live system. For example, to add a file #{/var/www/index.html}# in "
+#| "the live system, use:"
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
@@ -283,8 +287,8 @@ msgstr ""
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
#. type: Plain text
@@ -298,7 +302,7 @@ msgstr "Votre configuration aura alors le schéma suivant:"
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -322,14 +326,23 @@ msgstr "3~binary-local-includes Binary local includes"
#. type: Plain text
#: en/user_customization-contents.ssi:52
+#, fuzzy
+#| msgid ""
+#| "To include material such as documentation or videos on the media "
+#| "filesystem so that it is accessible immediately upon insertion of the "
+#| "media without booting the Live system, you can use binary local includes. "
+#| "This works in a similar fashion to chroot local includes. For example, "
+#| "suppose the files #{~/video_demo.*}# are demo videos of the live system "
+#| "described by and linked to by an HTML index page. Simply copy the "
+#| "material to #{config/binary_local-includes/}# as follows:"
msgid ""
"To include material such as documentation or videos on the media filesystem "
"so that it is accessible immediately upon insertion of the media without "
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
"Pour inclure des matériels tels que des documents ou des vidéos sur le "
"système de fichiers des supports, afin qu'il soit accessible dès l'insertion "
@@ -343,7 +356,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
@@ -433,15 +446,24 @@ msgstr "3~boot-time-hooks Hooks au moment du démarrage"
#. type: Plain text
#: en/user_customization-contents.ssi:84
+#, fuzzy
+#| msgid ""
+#| "To execute commands at boot time, you can supply live-config hooks as "
+#| "explained in the \"Customization\" section of its man page. Examine live-"
+#| "config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
+#| "numbers. Then provide your own hook prefixed with an appropriate sequence "
+#| "number, either as a chroot local include in #{config/chroot_local-"
+#| "includes/lib/live/config/}#, or as a custom package as discussed in "
+#| "{Installing modified or third-party packages}#installing-modified-or-"
+#| "third-party-packages."
msgid ""
"To execute commands at boot time, you can supply live-config hooks as "
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
"Pour exécuter des commandes au moment du démarrage, vous pouvez fournir live-"
"config hooks comme expliqué dans la section \"Personnalisation\" de sa page "
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 0f52535..d269307 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-11-06 17:04+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -68,8 +68,8 @@ msgstr ""
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -78,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -133,8 +133,8 @@ msgstr "code{"
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -142,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -1204,7 +1204,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
@@ -1292,11 +1292,17 @@ msgstr "3~apt-pinning APT pinning"
#. type: Plain text
#: en/user_customization-packages.ssi:312
+#, fuzzy
+#| msgid ""
+#| "For background, please first read the #{apt_preferences(5)}# man page. "
+#| "APT pinning can be configured either for build time, or else for run "
+#| "time. For the former, create #{config/chroot_apt/preferences}#. For the "
+#| "latter, create #{config/chroot_local-includes/etc/apt/preferences}#."
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
"Pour le contexte, s'il vous plaît lire d'abord la page de manuel #"
"{apt_preferences(5)}#. APT pinning peut être configuré soit pour le temps de "
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index 9e515a8..ab09375 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-08-25 16:47+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -38,48 +38,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,49 +102,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -240,12 +238,19 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:30
+#, fuzzy
+#| msgid ""
+#| "One possible way of changing the default password is by means of a hook "
+#| "as described in {Boot-time hooks}#boot-time-hooks. In order to do that "
+#| "you can use the \"passwd\" hook from #{/usr/share/doc/live-config/"
+#| "examples/hooks}#, prefix it accordingly (e.g. 200-passwd) and add it to #"
+#| "{config/chroot_local-includes/lib/live/config/}#"
msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
"Une façon possible de changer le mot de passe par défaut est au moyen d'un "
"hook comme décrit dans {Hooks au moment du démarrage}#boot-time-hooks. Pour "
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 2162d81..5a5e4be 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-11-06 16:58+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -73,8 +73,8 @@ msgstr ":B~ Exemples"
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -83,7 +83,7 @@ msgstr ":B~ Exemples"
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -138,8 +138,8 @@ msgstr "code{"
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -147,8 +147,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -434,7 +434,7 @@ msgstr ""
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
+" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
@@ -452,13 +452,21 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:113
+#, fuzzy
+#| msgid ""
+#| "First, #{--architecture i386}# ensures that on our #{amd64}# build "
+#| "system, we build a 32-bit version suitable for use on most machines. "
+#| "Second, we use #{--linux-flavours 686}# because we don't anticipate using "
+#| "this image on much older systems. Third, we've chosen the #{lxde}# "
+#| "package list to give us a minimal desktop. And finally, we have added two "
+#| "initial favourite packages: #{iceweasel}# and #{xchat}#."
msgid ""
"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
-"{--linux-flavours 686}# because we don't anticipate using this image on much "
-"older systems. Third, we've chosen the #{lxde}# package list to give us a "
-"minimal desktop. And finally, we have added two initial favourite packages: #"
-"{iceweasel}# and #{xchat}#."
+"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
+"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"a minimal desktop. And finally, we have added two initial favourite "
+"packages: #{iceweasel}# and #{xchat}#."
msgstr ""
"Tout d'abord, #{--architecture i386}# assure que sur notre système de "
"construction #{amd64}#, nous construisons une version 32 bits qui peut être "
@@ -637,7 +645,7 @@ msgstr ""
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
@@ -657,8 +665,8 @@ msgstr ""
#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat >config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
@@ -727,7 +735,7 @@ msgstr ""
#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
@@ -750,11 +758,27 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:240
+#, fuzzy
+#| msgid ""
+#| "The biggest space-saver here, compared to building a standard image on an "
+#| "#{i386}# architecture system, is to select only the #{486}# kernel "
+#| "flavour instead of the default #{-k \"486 686\"}#. Leaving off APT's "
+#| "indices with #{--binary-indices false}# also saves a fair amount of "
+#| "space, the tradeoff being that you need to #{apt-get update}# before "
+#| "using apt in the live system. Choosing the #{minimal}# package list "
+#| "leaves out the large #{locales}# package and associated utilities. "
+#| "Dropping recommended packages with #{--apt-recommends false}# saves some "
+#| "additional space, at the expense of omitting some packages you might "
+#| "otherwise expect to be there, such as #{firmware-linux-free}# which may "
+#| "be needed to support certain hardware. The remaining options shave off "
+#| "additional small amounts of space. It's up to you to decide if the "
+#| "functionality that is sacrificed with each optimization is worth the loss "
+#| "in functionality."
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
-"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
-"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-indices false}# also saves a fair amount of space, the tradeoff "
"being that you need to #{apt-get update}# before using apt in the live "
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
@@ -831,19 +855,15 @@ msgstr ""
"Maintenant, nous pouvons rechercher les tâches appropriées, d'abord avec:"
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
@@ -852,26 +872,16 @@ msgstr ""
"brazilian-portuguese. Maintenant, pour trouver les tâches liées:"
#. type: Plain text
-#: en/user_examples.ssi:276
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:280
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:284
+#: en/user_examples.ssi:275
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
"latin1 keyboard layout. We will also need to preseed our desktop choice, "
@@ -887,7 +897,7 @@ msgstr ""
"Maintenant, nous allons assembler les pièces:"
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -904,7 +914,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:301
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index 9d78e15..43d21b3 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-07-02 19:38+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -38,37 +38,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -101,38 +102,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -140,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -296,70 +298,39 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:34
+#, fuzzy
+#| msgid ""
+#| "Issuing #{lb config}# without any arguments creates a #{config/}# "
+#| "subdirectory which it populates with some default settings:"
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
"Exécuter #{lb config}# sans aucun argument crée un sous-répertoire #{config/}"
"# dont il remplit avec certains paramètres par défaut:"
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:76
+#, fuzzy
+#| msgid ""
+#| "Using #{lb config}# without any arguments would be suitable for users who "
+#| "need a very basic image, or who intend to later provide a more complete "
+#| "configuration via auto/config (see {Managing a configuration}#managing-a-"
+#| "configuration for details)."
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
"L'utilisation de #{lb config}# sans aucun argument serait approprié pour les "
@@ -368,7 +339,7 @@ msgstr ""
"{Gestion d'une configuration}#managing-a-configuration pour plus de détails)."
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
@@ -377,38 +348,43 @@ msgstr ""
"inclure la liste du paquet «gnome» dans votre configuration:"
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr "Il est possible de spécifier plusieurs options, telles que:"
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
"Une liste complète des options est disponible dans la page de manuel de #"
"{lb_config}#."
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr "3~lb-build La commande #{lb build}#"
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
+#, fuzzy
+#| msgid ""
+#| "The #{lb build}# command reads in your configuration from the config/ "
+#| "directory. It then runs the lower level commands needed to build your "
+#| "Live system."
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
@@ -417,12 +393,12 @@ msgstr ""
"construire votre système Live."
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr "3~lb-clean La commande #{lb clean}#"
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -442,12 +418,12 @@ msgstr ""
"la page de manuel de #{lb_clean}# pour une liste complète des options."
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr "2~live-boot Le paquet live-boot"
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -460,9 +436,15 @@ msgstr ""
"netboot tarballs, et les images clé USB."
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
+#, fuzzy
+#| msgid ""
+#| "At boot time it will look for read-only media containing a \"/live\" "
+#| "directory where a root filesystem (often a compressed filesystem image "
+#| "like squashfs) is stored. If found, it will create a writable "
+#| "environment, using aufs, for Debian like systems to boot from."
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
@@ -474,7 +456,7 @@ msgstr ""
"que systémes similaires à Debian puissent démarrer à partir de ça."
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -485,12 +467,12 @@ msgstr ""
"dans le chapitre sur initramfs."
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr "2~live-config Le paquet live-config"
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/it/index.html.in.po b/manual/po/it/index.html.in.po
index f427b3c..cead4da 100644
--- a/manual/po/it/index.html.in.po
+++ b/manual/po/it/index.html.in.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-03 18:22-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-12-08 17:00+0100\n"
"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -29,10 +29,16 @@ msgstr "Manuale Debian Live"
#. type: Content of: <html><body><p>
#: en/index.html.in:12
+#, fuzzy
+#| msgid ""
+#| "Please report errors, omissions, patches and suggestions to our "
+#| "mailinglist at <a href=\"mailto:debian-live at lists.debian.org\">debian-"
+#| "live at lists.debian.org</a> and read about <a href=\"html/about-manual."
+#| "html#how-to-contribute\">how to contribute</a> to the manual."
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Si prega di segnalare errori, omissioni, patch e suggerimenti sulla nostra "
@@ -47,30 +53,44 @@ msgstr "Formati disponibili"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+#, fuzzy
+#| msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:19
+#, fuzzy
+#| msgid ""
+#| "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-"
+#| "manual.html\">single page</a>"
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
"HTML: <a href=\"html/index.html\">multi-pagina</a>, <a href=\"html/live-"
"manual.html\">pagina unica</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+#, fuzzy
+#| msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:21
+#, fuzzy
+#| msgid ""
+#| "PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
+#| "\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+#| "manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+#| "manual.landscape-letter.pdf\">letter landscape</a>"
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 verticale</a>, <a href="
"\"pdf/live-manual.landscape-a4.pdf\">A4 orizzontale</a>, <a href=\"pdf/live-"
@@ -79,7 +99,9 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+#, fuzzy
+#| msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
msgstr "<a href=\"txt/live-manual.txt\">Testo semplice</a>"
#. type: Content of: <html><body><p>
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index a084909..5db45ed 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-06 12:40+0100\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-03-11 10:33+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-11-06\n"
+" :published: 2011-11-07\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/user_customization-contents.ssi.po b/manual/po/it/user_customization-contents.ssi.po
index eb02561..2ee1c0e 100644
--- a/manual/po/it/user_customization-contents.ssi.po
+++ b/manual/po/it/user_customization-contents.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 15:56+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-09-10 23:07+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -38,48 +38,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,49 +102,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -265,8 +263,14 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
+#, fuzzy
+#| msgid ""
+#| "To include files, simply add them to your #{config/chroot_local-includes}"
+#| "# directory. This directory corresponds to the root directory (#{/}#) of "
+#| "the live system. For example, to add a file #{/var/www/index.html}# in "
+#| "the live system, use:"
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
@@ -280,8 +284,8 @@ msgstr ""
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
#. type: Plain text
@@ -295,7 +299,7 @@ msgstr "La configurazione avrà quindi il seguente schema:"
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -319,14 +323,23 @@ msgstr "3~binary-local-includes Include locali binari"
#. type: Plain text
#: en/user_customization-contents.ssi:52
+#, fuzzy
+#| msgid ""
+#| "To include material such as documentation or videos on the media "
+#| "filesystem so that it is accessible immediately upon insertion of the "
+#| "media without booting the Live system, you can use binary local includes. "
+#| "This works in a similar fashion to chroot local includes. For example, "
+#| "suppose the files #{~/video_demo.*}# are demo videos of the live system "
+#| "described by and linked to by an HTML index page. Simply copy the "
+#| "material to #{config/binary_local-includes/}# as follows:"
msgid ""
"To include material such as documentation or videos on the media filesystem "
"so that it is accessible immediately upon insertion of the media without "
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
"Si possono utilizzare include locali binari per inserire sul filesystem del "
"supporto materiale come documentazione o video affinché sia immediatamente "
@@ -339,7 +352,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
@@ -426,15 +439,24 @@ msgstr "3~boot-time-hooks Hook in fase di avvio"
#. type: Plain text
#: en/user_customization-contents.ssi:84
+#, fuzzy
+#| msgid ""
+#| "To execute commands at boot time, you can supply live-config hooks as "
+#| "explained in the \"Customization\" section of its man page. Examine live-"
+#| "config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
+#| "numbers. Then provide your own hook prefixed with an appropriate sequence "
+#| "number, either as a chroot local include in #{config/chroot_local-"
+#| "includes/lib/live/config/}#, or as a custom package as discussed in "
+#| "{Installing modified or third-party packages}#installing-modified-or-"
+#| "third-party-packages."
msgid ""
"To execute commands at boot time, you can supply live-config hooks as "
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
"Per eseguire comandi all'avvio, è possibile fornire degli hook a live-config "
"come spiegato nella sezione \"Customization\" del suo manuale. Controllare "
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index bfc2126..e98d065 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-08-02 00:53+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -69,8 +69,8 @@ msgstr ""
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -79,7 +79,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -134,8 +134,8 @@ msgstr "code{"
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -143,8 +143,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -1272,7 +1272,7 @@ msgstr "È possibile non includere gli indici di APT con:"
#. type: Plain text
#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
@@ -1357,11 +1357,17 @@ msgstr "3~apt-pinning APT pinning"
#. type: Plain text
#: en/user_customization-packages.ssi:312
+#, fuzzy
+#| msgid ""
+#| "For background, please first read the #{apt_preferences(5)}# man page. "
+#| "APT pinning can be configured either for build time, or else for run "
+#| "time. For the former, create #{config/chroot_apt/preferences}#. For the "
+#| "latter, create #{config/chroot_local-includes/etc/apt/preferences}#."
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
"Si prega di leggere prima il manuale di #{apt_preferences(5)}#. Il pinning "
"può essere configurato sia in fase di costruzione sia di esecuzione; per la "
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index de6fd16..9ae6eae 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-09-10 23:11+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -102,49 +101,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -237,8 +235,8 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index e3ccc93..7d60558 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-04-16 03:33+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -74,8 +74,8 @@ msgstr ":B~ Esempi"
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -84,7 +84,7 @@ msgstr ":B~ Esempi"
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -139,8 +139,8 @@ msgstr "code{"
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -148,8 +148,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -450,7 +450,7 @@ msgstr ""
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
+" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
@@ -470,13 +470,21 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:113
+#, fuzzy
+#| msgid ""
+#| "First, #{--architecture i386}# ensures that on our #{amd64}# build "
+#| "system, we build a 32-bit version suitable for use on most machines. "
+#| "Second, we use #{--linux-flavours 686}# because we don't anticipate using "
+#| "this image on much older systems. Third, we've chosen the #{lxde}# "
+#| "package list to give us a minimal desktop. And finally, we have added two "
+#| "initial favourite packages: #{iceweasel}# and #{xchat}#."
msgid ""
"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
-"{--linux-flavours 686}# because we don't anticipate using this image on much "
-"older systems. Third, we've chosen the #{lxde}# package list to give us a "
-"minimal desktop. And finally, we have added two initial favourite packages: #"
-"{iceweasel}# and #{xchat}#."
+"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
+"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"a minimal desktop. And finally, we have added two initial favourite "
+"packages: #{iceweasel}# and #{xchat}#."
msgstr ""
"Per prima cosa, #{--architecture i386}# assicura che sul nostro sistema #"
"{amd64}# costruiamo una versione a 32-bit utilizzabile sulla maggior parte "
@@ -654,7 +662,7 @@ msgstr ""
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
@@ -675,8 +683,8 @@ msgstr ""
#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat >config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
@@ -744,7 +752,7 @@ msgstr ""
#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
@@ -766,11 +774,27 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:240
+#, fuzzy
+#| msgid ""
+#| "The biggest space-saver here, compared to building a standard image on an "
+#| "#{i386}# architecture system, is to select only the #{486}# kernel "
+#| "flavour instead of the default #{-k \"486 686\"}#. Leaving off APT's "
+#| "indices with #{--binary-indices false}# also saves a fair amount of "
+#| "space, the tradeoff being that you need to #{apt-get update}# before "
+#| "using apt in the live system. Choosing the #{minimal}# package list "
+#| "leaves out the large #{locales}# package and associated utilities. "
+#| "Dropping recommended packages with #{--apt-recommends false}# saves some "
+#| "additional space, at the expense of omitting some packages you might "
+#| "otherwise expect to be there, such as #{firmware-linux-free}# which may "
+#| "be needed to support certain hardware. The remaining options shave off "
+#| "additional small amounts of space. It's up to you to decide if the "
+#| "functionality that is sacrificed with each optimization is worth the loss "
+#| "in functionality."
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
-"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
-"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-indices false}# also saves a fair amount of space, the tradeoff "
"being that you need to #{apt-get update}# before using apt in the live "
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
@@ -851,19 +875,15 @@ msgid "Now we can search for the appropriate tasks, first with:"
msgstr "Ora si possono cercare i task appropriati:"
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
@@ -872,26 +892,16 @@ msgstr ""
"chiaramente, brazilian-portuguese. Ora per trovare i task correlati:"
#. type: Plain text
-#: en/user_examples.ssi:276
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:280
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:284
+#: en/user_examples.ssi:275
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
"latin1 keyboard layout. We will also need to preseed our desktop choice, "
@@ -901,7 +911,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -918,7 +928,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:301
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/it/user_overview.ssi.po b/manual/po/it/user_overview.ssi.po
index b908d90..3c24d5a 100644
--- a/manual/po/it/user_overview.ssi.po
+++ b/manual/po/it/user_overview.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2011-03-11 11:27+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -38,37 +38,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -101,38 +102,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -140,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -295,70 +297,39 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:34
+#, fuzzy
+#| msgid ""
+#| "Issuing #{lb config}# without any arguments creates a #{config/}# "
+#| "subdirectory which it populates with some default settings:"
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
"L'esecuzione di #{lb config}# senza argomenti crea una sottodirectory di #"
"{config/}# popolata con alcune impostazioni predefinite:"
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:76
+#, fuzzy
+#| msgid ""
+#| "Using #{lb config}# without any arguments would be suitable for users who "
+#| "need a very basic image, or who intend to later provide a more complete "
+#| "configuration via auto/config (see {Managing a configuration}#managing-a-"
+#| "configuration for details)."
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
"L'uso di #{lb config}# senza argomenti è adatto ad utenti che necessitano di "
@@ -367,7 +338,7 @@ msgstr ""
"configurazione}#managing-a-configuration)."
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
@@ -376,37 +347,42 @@ msgstr ""
"nella propria configurazione l'elenco del pacchetto \"gnome\":"
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr "È possibile specificare molte opzioni, come:"
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
"Una lista completa delle opzioni è disponibile nel manuale di #{lb_config}#."
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr "3~lb-build Il comando #{lb build}#"
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
+#, fuzzy
+#| msgid ""
+#| "The #{lb build}# command reads in your configuration from the config/ "
+#| "directory. It then runs the lower level commands needed to build your "
+#| "Live system."
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
@@ -415,12 +391,12 @@ msgstr ""
"live."
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr "3~lb-clean Il comando #{lb clean}#"
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -440,12 +416,12 @@ msgstr ""
"{lb_clean}#."
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr "2~live-boot Il pacchetto live-boot"
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -458,9 +434,15 @@ msgstr ""
"per l'avvio da rete e immagini per penne USB."
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
+#, fuzzy
+#| msgid ""
+#| "At boot time it will look for read-only media containing a \"/live\" "
+#| "directory where a root filesystem (often a compressed filesystem image "
+#| "like squashfs) is stored. If found, it will create a writable "
+#| "environment, using aufs, for Debian like systems to boot from."
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
@@ -471,7 +453,7 @@ msgstr ""
"avviarsi da sistemi simili a Debian."
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -482,12 +464,12 @@ msgstr ""
"handbook.alioth.debian.org/."
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr "2~live-config Il pacchetto live-config"
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/pt_BR/index.html.in.po b/manual/po/pt_BR/index.html.in.po
index a600fbd..ee82aa8 100644
--- a/manual/po/pt_BR/index.html.in.po
+++ b/manual/po/pt_BR/index.html.in.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-03 18:22-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-12-08 16:21+0100\n"
"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -28,10 +28,16 @@ msgstr "Manual do Debian Live"
#. type: Content of: <html><body><p>
#: en/index.html.in:12
+#, fuzzy
+#| msgid ""
+#| "Please report errors, omissions, patches and suggestions to our "
+#| "mailinglist at <a href=\"mailto:debian-live at lists.debian.org\">debian-"
+#| "live at lists.debian.org</a> and read about <a href=\"html/about-manual."
+#| "html#how-to-contribute\">how to contribute</a> to the manual."
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
"Por favor reporte erros, omissões, patches e sugestões para nossa lista de "
@@ -46,30 +52,44 @@ msgstr "Formatos Disponíveis"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+#, fuzzy
+#| msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
msgstr "<a href=\"epub/live-manual.epub\">EPUB</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:19
+#, fuzzy
+#| msgid ""
+#| "HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-"
+#| "manual.html\">single page</a>"
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
"HTML: <a href=\"html/index.html\">Páginas multiplas</a>, <a href=\"html/live-"
"manual.html\">Página única</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+#, fuzzy
+#| msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
msgstr "<a href=\"odf/live-manual.odt\">ODF</a>"
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:21
+#, fuzzy
+#| msgid ""
+#| "PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
+#| "\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+#| "manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+#| "manual.landscape-letter.pdf\">letter landscape</a>"
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 retrato</a>, <a href="
"\"pdf/live-manual.landscape-a4.pdf\">A4 paisagem</a>, <a href=\"pdf/live-"
@@ -78,7 +98,9 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+#, fuzzy
+#| msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
msgstr "<a href=\"txt/live-manual.txt\">Texto plano</a>"
#. type: Content of: <html><body><p>
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 82abd6e..aa338c2 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 2.0.0\n"
-"POT-Creation-Date: 2011-11-06 12:40+0100\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-11-06\n"
+" :published: 2011-11-07\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-contents.ssi.po b/manual/po/pt_BR/user_customization-contents.ssi.po
index 1dba000..304c61d 100644
--- a/manual/po/pt_BR/user_customization-contents.ssi.po
+++ b/manual/po/pt_BR/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 15:56+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -102,49 +101,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -235,7 +233,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
@@ -245,8 +243,8 @@ msgstr ""
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
#. type: Plain text
@@ -260,7 +258,7 @@ msgstr ""
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -288,14 +286,14 @@ msgid ""
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
@@ -371,10 +369,9 @@ msgid ""
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index f160554..09c5ba7 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -67,8 +67,8 @@ msgstr ""
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -132,8 +132,8 @@ msgstr "code{"
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -141,8 +141,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -939,7 +939,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
@@ -1006,7 +1006,7 @@ msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index c004d2d..eaeef36 100644
--- a/manual/po/pt_BR/user_customization-runtime.ssi.po
+++ b/manual/po/pt_BR/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -102,49 +101,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -222,8 +220,8 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index f21bff1..d37db6d 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -72,8 +72,8 @@ msgstr ""
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -82,7 +82,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -137,8 +137,8 @@ msgstr "code{"
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -146,8 +146,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -375,7 +375,7 @@ msgstr ""
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
+" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
@@ -396,10 +396,10 @@ msgstr ""
msgid ""
"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
-"{--linux-flavours 686}# because we don't anticipate using this image on much "
-"older systems. Third, we've chosen the #{lxde}# package list to give us a "
-"minimal desktop. And finally, we have added two initial favourite packages: #"
-"{iceweasel}# and #{xchat}#."
+"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
+"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"a minimal desktop. And finally, we have added two initial favourite "
+"packages: #{iceweasel}# and #{xchat}#."
msgstr ""
#. type: Plain text
@@ -538,7 +538,7 @@ msgstr ""
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
@@ -555,8 +555,8 @@ msgstr ""
#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat >config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
@@ -615,7 +615,7 @@ msgstr ""
#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
@@ -637,8 +637,8 @@ msgstr ""
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
-"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
-"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-indices false}# also saves a fair amount of space, the tradeoff "
"being that you need to #{apt-get update}# before using apt in the live "
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
@@ -691,45 +691,31 @@ msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:276
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:280
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:284
+#: en/user_examples.ssi:275
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
"latin1 keyboard layout. We will also need to preseed our desktop choice, "
@@ -739,7 +725,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -756,7 +742,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:301
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/pt_BR/user_overview.ssi.po b/manual/po/pt_BR/user_overview.ssi.po
index a76f735..bef20fc 100644
--- a/manual/po/pt_BR/user_overview.ssi.po
+++ b/manual/po/pt_BR/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -76,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -100,38 +101,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -139,8 +141,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -261,118 +263,77 @@ msgstr ""
#: en/user_overview.ssi:34
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:76
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -384,12 +345,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -398,16 +359,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -415,12 +376,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/po/ro/index.html.in.po b/manual/po/ro/index.html.in.po
index ddb1cb2..24423dc 100644
--- a/manual/po/ro/index.html.in.po
+++ b/manual/po/ro/index.html.in.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-02-03 18:22-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-10-20 20:02+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,7 +32,7 @@ msgstr ""
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
@@ -43,33 +43,33 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:19
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:21
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
msgstr ""
#. type: Content of: <html><body><p>
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index c7988dc..00f8da1 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 2.0.0\n"
-"POT-Creation-Date: 2011-11-06 12:40+0100\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-11-06\n"
+" :published: 2011-11-07\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-contents.ssi.po b/manual/po/ro/user_customization-contents.ssi.po
index a4e6813..0fbba43 100644
--- a/manual/po/ro/user_customization-contents.ssi.po
+++ b/manual/po/ro/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 15:56+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -38,48 +38,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,49 +102,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -236,7 +234,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
@@ -246,8 +244,8 @@ msgstr ""
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
#. type: Plain text
@@ -261,7 +259,7 @@ msgstr ""
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -289,14 +287,14 @@ msgid ""
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
@@ -372,10 +370,9 @@ msgid ""
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index b255cf3..b0a43ff 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -68,8 +68,8 @@ msgstr ""
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -78,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -133,8 +133,8 @@ msgstr "code{"
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -142,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -940,7 +940,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
@@ -1007,7 +1007,7 @@ msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index c782616..50a7773 100644
--- a/manual/po/ro/user_customization-runtime.ssi.po
+++ b/manual/po/ro/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -38,48 +38,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -103,49 +102,48 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -223,8 +221,8 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 2815167..cf7d66e 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -73,8 +73,8 @@ msgstr ""
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -83,7 +83,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -138,8 +138,8 @@ msgstr "code{"
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -147,8 +147,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -376,7 +376,7 @@ msgstr ""
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
+" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
@@ -397,10 +397,10 @@ msgstr ""
msgid ""
"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
-"{--linux-flavours 686}# because we don't anticipate using this image on much "
-"older systems. Third, we've chosen the #{lxde}# package list to give us a "
-"minimal desktop. And finally, we have added two initial favourite packages: #"
-"{iceweasel}# and #{xchat}#."
+"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
+"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"a minimal desktop. And finally, we have added two initial favourite "
+"packages: #{iceweasel}# and #{xchat}#."
msgstr ""
#. type: Plain text
@@ -539,7 +539,7 @@ msgstr ""
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
@@ -556,8 +556,8 @@ msgstr ""
#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat >config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
@@ -616,7 +616,7 @@ msgstr ""
#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
@@ -638,8 +638,8 @@ msgstr ""
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
-"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
-"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-indices false}# also saves a fair amount of space, the tradeoff "
"being that you need to #{apt-get update}# before using apt in the live "
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
@@ -692,45 +692,31 @@ msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:276
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:280
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:284
+#: en/user_examples.ssi:275
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
"latin1 keyboard layout. We will also need to preseed our desktop choice, "
@@ -740,7 +726,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -757,7 +743,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:301
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/ro/user_overview.ssi.po b/manual/po/ro/user_overview.ssi.po
index fdacd76..4bd5b5d 100644
--- a/manual/po/ro/user_overview.ssi.po
+++ b/manual/po/ro/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -38,37 +38,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +78,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr "code{"
@@ -101,38 +102,39 @@ msgstr "code{"
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -140,8 +142,8 @@ msgstr "code{"
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr "}code"
@@ -262,118 +264,77 @@ msgstr ""
#: en/user_overview.ssi:34
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:76
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -385,12 +346,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -399,16 +360,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -416,12 +377,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/pot/index.html.in.pot b/manual/pot/index.html.in.pot
index f1862ef..60891c4 100644
--- a/manual/pot/index.html.in.pot
+++ b/manual/pot/index.html.in.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-04-23 14:15+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\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"
@@ -31,7 +31,7 @@ msgstr ""
msgid ""
"Please report errors, omissions, patches and suggestions to our mailinglist "
"at <a href=\"mailto:debian-live at lists.debian.org\">debian-live at lists.debian."
-"org</a> and read about <a href=\"html/about-manual.html#how-to-contribute"
+"org</a> and read about <a href=\"html/about-manual.en.html#how-to-contribute"
"\">how to contribute</a> to the manual."
msgstr ""
@@ -42,33 +42,33 @@ msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:18
-msgid "<a href=\"epub/live-manual.epub\">EPUB</a>"
+msgid "<a href=\"epub/live-manual.en.epub\">EPUB</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:19
msgid ""
-"HTML: <a href=\"html/index.html\">multi page</a>, <a href=\"html/live-manual."
-"html\">single page</a>"
+"HTML: <a href=\"html/index.en.html\">multi page</a>, <a href=\"html/live-"
+"manual.en.html\">single page</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:20
-msgid "<a href=\"odf/live-manual.odt\">ODF</a>"
+msgid "<a href=\"odf/live-manual.en.odt\">ODF</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:21
msgid ""
-"PDF: <a href=\"pdf/live-manual.portrait-a4.pdf\">A4 portrait</a>, <a href="
-"\"pdf/live-manual.landscape-a4.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
-"manual.portrait-letter.pdf\">letter portrait</a>, <a href=\"pdf/live-manual."
-"landscape-letter.pdf\">letter landscape</a>"
+"PDF: <a href=\"pdf/live-manual.portrait-a4.en.pdf\">A4 portrait</a>, <a href="
+"\"pdf/live-manual.landscape-a4.en.pdf\">A4 landscape</a>, <a href=\"pdf/live-"
+"manual.portrait-letter.en.pdf\">letter portrait</a>, <a href=\"pdf/live-"
+"manual.landscape-letter.en.pdf\">letter landscape</a>"
msgstr ""
#. type: Content of: <html><body><ul><li>
#: en/index.html.in:22
-msgid "<a href=\"txt/live-manual.txt\">Plain text</a>"
+msgid "<a href=\"txt/live-manual.en.txt\">Plain text</a>"
msgstr ""
#. type: Content of: <html><body><p>
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index c41123a..79a58b3 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: 2011-11-06 12:40+0100\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-11-06\n"
+" :published: 2011-11-07\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index 0dccb5f..50cedbc 100644
--- a/manual/pot/user_customization-contents.ssi.pot
+++ b/manual/pot/user_customization-contents.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-08-25 15:56+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\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"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -102,49 +101,48 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -235,7 +233,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:24
msgid ""
-"To include files, simply add them to your #{config/chroot_local-includes}# "
+"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory (#{/}#) of the "
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
@@ -245,8 +243,8 @@ msgstr ""
#: en/user_customization-contents.ssi:29
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/var/www\n"
-" $ cp /path/to/my/index.html config/chroot_local-includes/var/www\n"
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
#. type: Plain text
@@ -260,7 +258,7 @@ msgstr ""
msgid ""
" -- config\n"
" [...]\n"
-" |-- chroot_local-includes\n"
+" |-- includes.chroot\n"
" | `-- var\n"
" | `-- www\n"
" | `-- index.html\n"
@@ -288,14 +286,14 @@ msgid ""
"booting the Live system, you can use binary local includes. This works in a "
"similar fashion to chroot local includes. For example, suppose the files #{~/"
"video_demo.*}# are demo videos of the live system described by and linked to "
-"by an HTML index page. Simply copy the material to #{config/binary_local-"
-"includes/}# as follows:"
+"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
+"# as follows:"
msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, no-wrap
-msgid " $ cp ~/video_demo.* config/binary_local-includes/\n"
+msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
@@ -371,10 +369,9 @@ msgid ""
"explained in the \"Customization\" section of its man page. Examine live-"
"config's own hooks provided in #{/lib/live/config/}#, noting the sequence "
"numbers. Then provide your own hook prefixed with an appropriate sequence "
-"number, either as a chroot local include in #{config/chroot_local-includes/"
-"lib/live/config/}#, or as a custom package as discussed in {Installing "
-"modified or third-party packages}#installing-modified-or-third-party-"
-"packages."
+"number, either as a chroot local include in #{config/includes.chroot/lib/"
+"live/config/}#, or as a custom package as discussed in {Installing modified "
+"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index a97a4fd..fd1dfc4 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\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"
@@ -67,8 +67,8 @@ msgstr ""
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -77,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -132,8 +132,8 @@ msgstr ""
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -141,8 +141,8 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -939,7 +939,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:290
#, no-wrap
-msgid " $ lb config --binary-indices false\n"
+msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
@@ -1006,7 +1006,7 @@ msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index ceaaf5c..26e0b76 100644
--- a/manual/pot/user_customization-runtime.ssi.pot
+++ b/manual/pot/user_customization-runtime.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-08-25 17:01+0300\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\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"
@@ -37,48 +37,47 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348
-#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
-#: en/user_examples.ssi:64 en/user_examples.ssi:80 en/user_examples.ssi:90
-#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:131
-#: en/user_examples.ssi:139 en/user_examples.ssi:154 en/user_examples.ssi:162
-#: en/user_examples.ssi:178 en/user_examples.ssi:190 en/user_examples.ssi:206
-#: en/user_examples.ssi:220 en/user_examples.ssi:229 en/user_examples.ssi:247
-#: en/user_examples.ssi:255 en/user_examples.ssi:268 en/user_examples.ssi:283
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -102,49 +101,48 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:352
-#: en/user_customization-packages.ssi:361 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
-#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:58
-#: en/user_examples.ssi:68 en/user_examples.ssi:86 en/user_examples.ssi:101
-#: en/user_examples.ssi:111 en/user_examples.ssi:123 en/user_examples.ssi:135
-#: en/user_examples.ssi:150 en/user_examples.ssi:158 en/user_examples.ssi:166
-#: en/user_examples.ssi:186 en/user_examples.ssi:202 en/user_examples.ssi:210
-#: en/user_examples.ssi:225 en/user_examples.ssi:233 en/user_examples.ssi:251
-#: en/user_examples.ssi:264 en/user_examples.ssi:279 en/user_examples.ssi:297
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:149
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -222,8 +220,8 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/chroot_local-"
-"includes/lib/live/config/}#"
+"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"chroot/lib/live/config/}#"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 2ec939c..2bde1b6 100644
--- a/manual/pot/user_examples.ssi.pot
+++ b/manual/pot/user_examples.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-06 10:45-0400\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\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"
@@ -72,8 +72,8 @@ msgstr ""
#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
-#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:271
-#: en/user_examples.ssi:286 en/user_installation.ssi:38
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -82,7 +82,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -137,8 +137,8 @@ msgstr ""
#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
-#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:300 en/user_installation.ssi:42
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -146,8 +146,8 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -375,7 +375,7 @@ msgstr ""
msgid ""
" lb config noauto \\\n"
" --architecture i386 \\\n"
-" --linux-flavours 686 \\\n"
+" --linux-flavours 686-pae \\\n"
" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
@@ -396,10 +396,10 @@ msgstr ""
msgid ""
"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
"we build a 32-bit version suitable for use on most machines. Second, we use #"
-"{--linux-flavours 686}# because we don't anticipate using this image on much "
-"older systems. Third, we've chosen the #{lxde}# package list to give us a "
-"minimal desktop. And finally, we have added two initial favourite packages: #"
-"{iceweasel}# and #{xchat}#."
+"{--linux-flavours 686-pae}# because we don't anticipate using this image on "
+"much older systems. Third, we've chosen the #{lxde}# package list to give us "
+"a minimal desktop. And finally, we have added two initial favourite "
+"packages: #{iceweasel}# and #{xchat}#."
msgstr ""
#. type: Plain text
@@ -538,7 +538,7 @@ msgstr ""
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\n"
-" $ lb config -a i386 -k 686 -p standard-x11 \\\n"
+" $ lb config -a i386 -k 686-pae -p standard-x11 \\\n"
" --apt-recommends false\n"
" $ echo \"gdm3 metacity xvnc4viewer\" >> config/package-lists/my.list.chroot\n"
msgstr ""
@@ -555,8 +555,8 @@ msgstr ""
#: en/user_examples.ssi:197
#, no-wrap
msgid ""
-" $ mkdir -p config/chroot_local-includes/etc/skel\n"
-" $ cat >config/chroot_local-includes/etc/skel/.xsession <<END\n"
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat >config/includes.chroot/etc/skel/.xsession <<END\n"
" #!/bin/sh\n"
msgstr ""
@@ -615,7 +615,7 @@ msgstr ""
#: en/user_examples.ssi:226
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --binary-indices false \\\n"
+" $ lb config -k 486 -p minimal --apt-indices false \\\n"
" --memtest none --apt-recommends false --includes none\n"
msgstr ""
@@ -637,8 +637,8 @@ msgstr ""
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
-"instead of the default #{-k \"486 686\"}#. Leaving off APT's indices with #"
-"{--binary-indices false}# also saves a fair amount of space, the tradeoff "
+"instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's indices "
+"with #{--apt-indices false}# also saves a fair amount of space, the tradeoff "
"being that you need to #{apt-get update}# before using apt in the live "
"system. Choosing the #{minimal}# package list leaves out the large #{locales}"
"# package and associated utilities. Dropping recommended packages with #{--"
@@ -691,45 +691,31 @@ msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:261
#, no-wrap
msgid ""
-" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
-" Description: Brazilian Portuguese environment\n"
-" This task installs programs, data files, and\n"
-" documentation that make it easier for Brazilian Portuguese speakers\n"
-" to use Debian.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:265
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:276
+#: en/user_examples.ssi:271
#, no-wrap
msgid ""
-" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
-" Description: Brazilian Portuguese desktop\n"
-" This task localises the desktop in Brasilian Portuguese.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:280
-#, no-wrap
-msgid ""
" Task: brazilian-portuguese-kde-desktop\n"
-" Description: Brazilian Portuguese KDE desktop\n"
-" This task localises the KDE desktop in Brazilian Portuguese.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:284
+#: en/user_examples.ssi:275
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
"latin1 keyboard layout. We will also need to preseed our desktop choice, "
@@ -739,7 +725,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:298
+#: en/user_examples.ssi:289
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -756,7 +742,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:301
+#: en/user_examples.ssi:292
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index 9acaf7c..ba7d3c7 100644
--- a/manual/pot/user_overview.ssi.pot
+++ b/manual/pot/user_overview.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-05-13 12:02-0200\n"
+"POT-Creation-Date: 2011-11-07 08:16-0400\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"
@@ -37,37 +37,38 @@ msgstr ""
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
-#: en/user_customization-installer.ssi:43
+#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
-#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
-#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
-#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
-#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
-#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
-#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
-#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
-#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
-#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
-#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:190
-#: en/user_examples.ssi:206 en/user_examples.ssi:220 en/user_examples.ssi:229
-#: en/user_examples.ssi:247 en/user_examples.ssi:255 en/user_examples.ssi:268
-#: en/user_examples.ssi:283 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
+#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
+#: en/user_customization-packages.ssi:101
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
+#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
+#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:119 en/user_examples.ssi:14
+#: en/user_examples.ssi:30 en/user_examples.ssi:40 en/user_examples.ssi:54
+#: en/user_examples.ssi:67 en/user_examples.ssi:83 en/user_examples.ssi:93
+#: en/user_examples.ssi:107 en/user_examples.ssi:117 en/user_examples.ssi:127
+#: en/user_examples.ssi:141 en/user_examples.ssi:149 en/user_examples.ssi:157
+#: en/user_examples.ssi:165 en/user_examples.ssi:181 en/user_examples.ssi:193
+#: en/user_examples.ssi:209 en/user_examples.ssi:223 en/user_examples.ssi:232
+#: en/user_examples.ssi:250 en/user_examples.ssi:258 en/user_examples.ssi:267
+#: en/user_examples.ssi:277 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:74
#: en/user_installation.ssi:82 en/user_installation.ssi:90
@@ -76,7 +77,7 @@ msgstr ""
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
-#: en/user_overview.ssi:80 en/user_overview.ssi:88
+#: en/user_overview.ssi:48 en/user_overview.ssi:56
msgid "code{"
msgstr ""
@@ -100,38 +101,39 @@ msgstr ""
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
-#: en/user_customization-installer.ssi:37
-#: en/user_customization-installer.ssi:48
+#: en/user_customization-installer.ssi:38
+#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
-#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
-#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
-#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
-#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
-#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
-#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:186 en/user_examples.ssi:202
-#: en/user_examples.ssi:210 en/user_examples.ssi:225 en/user_examples.ssi:233
-#: en/user_examples.ssi:251 en/user_examples.ssi:264 en/user_examples.ssi:279
-#: en/user_examples.ssi:297 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
+#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
+#: en/user_customization-packages.ssi:105
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
+#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
+#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
+#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
+#: en/user_customization-runtime.ssi:105 en/user_customization-runtime.ssi:115
+#: en/user_customization-runtime.ssi:124 en/user_examples.ssi:20
+#: en/user_examples.ssi:34 en/user_examples.ssi:44 en/user_examples.ssi:61
+#: en/user_examples.ssi:71 en/user_examples.ssi:89 en/user_examples.ssi:103
+#: en/user_examples.ssi:111 en/user_examples.ssi:121 en/user_examples.ssi:133
+#: en/user_examples.ssi:145 en/user_examples.ssi:153 en/user_examples.ssi:161
+#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
+#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
+#: en/user_examples.ssi:254 en/user_examples.ssi:263 en/user_examples.ssi:273
+#: en/user_examples.ssi:291 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -139,8 +141,8 @@ msgstr ""
#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
-#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
-#: en/user_overview.ssi:84 en/user_overview.ssi:92
+#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:42
+#: en/user_overview.ssi:52 en/user_overview.ssi:60
msgid "}code"
msgstr ""
@@ -261,118 +263,77 @@ msgstr ""
#: en/user_overview.ssi:34
msgid ""
"Issuing #{lb config}# without any arguments creates a #{config/}# "
-"subdirectory which it populates with some default settings:"
+"subdirectory which it populates with some default settings, and a skeleton #"
+"{auto/}# subdirectory tree."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:39
+#: en/user_overview.ssi:40
#, no-wrap
msgid ""
" $ lb config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
" P: Creating config tree\n"
msgstr ""
#. type: Plain text
#: en/user_overview.ssi:44
-#, no-wrap
-msgid ""
-" $ ls -l\n"
-" total 8\n"
-" drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto\n"
-" drwxr-xr-x 22 user user 4096 Sep 7 13:02 config\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:72
-#, no-wrap
-msgid ""
-" $ ls -l config/\n"
-" total 104\n"
-" -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux\n"
-" -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap\n"
-" -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources\n"
-" -rw-r--r-- 1 user user 2954 Sep 7 13:02 common\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes\n"
-" -rw-r--r-- 1 user user 205 Sep 7 13:02 source\n"
-" drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_overview.ssi:76
msgid ""
"Using #{lb config}# without any arguments would be suitable for users who "
"need a very basic image, or who intend to later provide a more complete "
-"configuration via auto/config (see {Managing a configuration}#managing-a-"
+"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:78
+#: en/user_overview.ssi:46
msgid ""
"Normally, you will want to specify some options. For example, to include the "
"'gnome' package list in your configuration:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:82
+#: en/user_overview.ssi:50
#, no-wrap
msgid " $ lb config -p gnome\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:86
+#: en/user_overview.ssi:54
msgid "It is possible to specify many options, such as:"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:90
+#: en/user_overview.ssi:58
#, no-wrap
msgid " $ lb config --binary-images net --hostname live-machine --username live-user ...\n"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:94
+#: en/user_overview.ssi:62
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:96
+#: en/user_overview.ssi:64
msgid "3~lb-build The #{lb build}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:98
+#: en/user_overview.ssi:66
msgid ""
-"The #{lb build}# command reads in your configuration from the config/ "
+"The #{lb build}# command reads in your configuration from the #{config/}# "
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:100
+#: en/user_overview.ssi:68
msgid "3~lb-clean The #{lb clean}# command"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:102
+#: en/user_overview.ssi:70
msgid ""
"It is the job of the #{lb clean}# command to remove various parts of a build "
"so subsequent builds can start from a clean state. By default, #{chroot}#, #"
@@ -384,12 +345,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:104
+#: en/user_overview.ssi:72
msgid "2~live-boot The live-boot package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:106
+#: en/user_overview.ssi:74
msgid ""
"live-boot is a collection of scripts providing hooks for the initramfs-"
"tools, used to generate an initramfs capable of booting live systems, such "
@@ -398,16 +359,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:108
+#: en/user_overview.ssi:76
msgid ""
-"At boot time it will look for read-only media containing a \"/live\" "
+"At boot time it will look for read-only media containing a #{/live/}# "
"directory where a root filesystem (often a compressed filesystem image like "
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:110
+#: en/user_overview.ssi:78
msgid ""
"More information on initial ramfs in Debian can be found in the Debian Linux "
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
@@ -415,12 +376,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:112
+#: en/user_overview.ssi:80
msgid "2~live-config The live-config package"
msgstr ""
#. type: Plain text
-#: en/user_overview.ssi:113
+#: en/user_overview.ssi:81
msgid ""
"live-config consists of the scripts that run at boot time after live-boot to "
"configure the live system automatically. It handles such tasks as setting "
diff --git a/manual/pt_BR/index.html.in b/manual/pt_BR/index.html.in
index f187810..dddad62 100644
--- a/manual/pt_BR/index.html.in
+++ b/manual/pt_BR/index.html.in
@@ -9,25 +9,25 @@
<h2>Manual do Debian Live</h2>
<p>
- Por favor reporte erros, omissões, patches e sugestões para nossa lista de
-discussão em <a
+ Please report errors, omissions, patches and suggestions to our mailinglist
+at <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-e leia sobre <a href="html/about-manual.html#how-to-contribute">como
-contribuir</a> com o manual.
+and read about <a href="html/about-manual.en.html#how-to-contribute">how to
+contribute</a> to the manual.
</p>
<h3>Formatos Disponíveis</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">Páginas multiplas</a>, <a
-href="html/live-manual.html">Página única</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 retrato</a>, <a
-href="pdf/live-manual.landscape-a4.pdf">A4 paisagem</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">US retrato</a>, <a
-href="pdf/live-manual.landscape-letter.pdf">US paisagem</a></li>
- <li><a href="txt/live-manual.txt">Texto plano</a></li>
+ <li><a href="epub/live-manual.en.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.en.html">multi page</a>, <a
+href="html/live-manual.en.html">single page</a></li>
+ <li><a href="odf/live-manual.en.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.en.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape-a4.en.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait-letter.en.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape-letter.en.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.en.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index bdb8c91..89a2a6e 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-11-06
+ :published: 2011-11-07
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/user_customization-contents.ssi b/manual/pt_BR/user_customization-contents.ssi
index 814ba40..e7d92bd 100644
--- a/manual/pt_BR/user_customization-contents.ssi
+++ b/manual/pt_BR/user_customization-contents.ssi
@@ -42,15 +42,15 @@ files that can be simply added or replaced in the image without processing;
see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
needed.
-To include files, simply add them to your #{config/chroot_local-includes}#
+To include files, simply add them to your #{config/includes.chroot}#
directory. This directory corresponds to the root directory (#{/}#) of the
live system. For example, to add a file #{/var/www/index.html}# in the live
system, use:
code{
- $ mkdir -p config/chroot_local-includes/var/www
- $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -60,7 +60,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -80,11 +80,11 @@ booting the Live system, you can use binary local includes. This works in a
similar fashion to chroot local includes. For example, suppose the files
#{~/video_demo.*}# are demo videos of the live system described by and
linked to by an HTML index page. Simply copy the material to
-#{config/binary_local-includes/}# as follows:
+#{config/includes.binary/}# as follows:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -128,7 +128,7 @@ explained in the "Customization" section of its man page. Examine
live-config's own hooks provided in #{/lib/live/config/}#, noting the
sequence numbers. Then provide your own hook prefixed with an appropriate
sequence number, either as a chroot local include in
-#{config/chroot_local-includes/lib/live/config/}#, or as a custom package as
+#{config/includes.chroot/lib/live/config/}#, or as a custom package as
discussed in {Installing modified or third-party
packages}#installing-modified-or-third-party-packages.
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 8860bc8..568ef99 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -463,7 +463,7 @@ with:
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -506,7 +506,7 @@ and #{aptitude}# for details.
For background, please first read the #{apt_preferences(5)}# man page. APT
pinning can be configured either for build time, or else for run time. For
the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/apt/preferences}#.
+#{config/includes.chroot/etc/apt/preferences}#.
Let's say you are building a Squeeze live system but need all the live
packages that end up in the binary image to be installed from Sid at build
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index 4bbf347..97dccb6 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -42,7 +42,7 @@ One possible way of changing the default password is by means of a hook as
described in {Boot-time hooks}#boot-time-hooks. In order to do that you can
use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#,
prefix it accordingly (e.g. 200-passwd) and add it to
-#{config/chroot_local-includes/lib/live/config/}#
+#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Customizing locale and language
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index eb2dac8..6cf6ccb 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -132,7 +132,7 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
+ --linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -148,7 +148,7 @@ code{
First, #{--architecture i386}# ensures that on our #{amd64}# build system,
we build a 32-bit version suitable for use on most machines. Second, we use
-#{--linux-flavours 686}# because we don't anticipate using this image on
+#{--linux-flavours 686-pae}# because we don't anticipate using this image on
much older systems. Third, we've chosen the #{lxde}# package list to give us
a minimal desktop. And finally, we have added two initial favourite
packages: #{iceweasel}# and #{xchat}#.
@@ -242,7 +242,7 @@ code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
$ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
@@ -254,8 +254,8 @@ to port #{5901}# on a server at #{192.168.1.2}#:
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat >config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -292,7 +292,7 @@ packages will most likely produce a broken live system.
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
@@ -311,8 +311,8 @@ by the default configuration in {Tutorial 1}#tutorial-1.
The biggest space-saver here, compared to building a standard image on an
#{i386}# architecture system, is to select only the #{486}# kernel flavour
-instead of the default #{-k "486 686"}#. Leaving off APT's indices with
-#{--binary-indices false}# also saves a fair amount of space, the tradeoff
+instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
+#{--apt-indices false}# also saves a fair amount of space, the tradeoff
being that you need to #{apt-get update}# before using apt in the live
system. Choosing the #{minimal}# package list leaves out the large
#{locales}# package and associated utilities. Dropping recommended packages
@@ -347,12 +347,8 @@ Now we can search for the appropriate tasks, first with:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
@@ -361,14 +357,9 @@ brazilian-portuguese. Now to find the related tasks:
code{
- $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
diff --git a/manual/pt_BR/user_overview.ssi b/manual/pt_BR/user_overview.ssi
index ddb3b58..ad40e60 100644
--- a/manual/pt_BR/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -52,51 +52,20 @@ time-consuming and error-prone, the #{lb config}# command can be used to
create skeleton configuration folders.
Issuing #{lb config}# without any arguments creates a #{config/}#
-subdirectory which it populates with some default settings:
+subdirectory which it populates with some default settings, and a skeleton
+#{auto/}# subdirectory tree.
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
Using #{lb config}# without any arguments would be suitable for users who
need a very basic image, or who intend to later provide a more complete
-configuration via auto/config (see {Managing a
+configuration via #{auto/config}# (see {Managing a
configuration}#managing-a-configuration for details).
Normally, you will want to specify some options. For example, to include the
@@ -120,7 +89,7 @@ A full list of options is available in the #{lb_config}# man page.
3~lb-build The #{lb build}# command
-The #{lb build}# command reads in your configuration from the config/
+The #{lb build}# command reads in your configuration from the #{config/}#
directory. It then runs the lower level commands needed to build your Live
system.
@@ -141,10 +110,10 @@ initramfs-tools, used to generate an initramfs capable of booting live
systems, such as those created by live-build. This includes the Debian Live
ISOs, netboot tarballs, and USB stick images.
-At boot time it will look for read-only media containing a "/live" directory
-where a root filesystem (often a compressed filesystem image like squashfs)
-is stored. If found, it will create a writable environment, using aufs, for
-Debian like systems to boot from.
+At boot time it will look for read-only media containing a #{/live/}#
+directory where a root filesystem (often a compressed filesystem image like
+squashfs) is stored. If found, it will create a writable environment, using
+aufs, for Debian like systems to boot from.
More information on initial ramfs in Debian can be found in the Debian Linux
Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter
diff --git a/manual/ro/index.html.in b/manual/ro/index.html.in
index 223cfe0..5cf07c7 100644
--- a/manual/ro/index.html.in
+++ b/manual/ro/index.html.in
@@ -12,22 +12,22 @@
Please report errors, omissions, patches and suggestions to our mailinglist
at <a
href="mailto:debian-live at lists.debian.org">debian-live at lists.debian.org</a>
-and read about <a href="html/about-manual.html#how-to-contribute">how to
+and read about <a href="html/about-manual.en.html#how-to-contribute">how to
contribute</a> to the manual.
</p>
<h3>Available Formats</h3>
<ul>
- <li><a href="epub/live-manual.epub">EPUB</a></li>
- <li>HTML: <a href="html/index.html">multi page</a>, <a
-href="html/live-manual.html">single page</a></li>
- <li><a href="odf/live-manual.odt">ODF</a></li>
- <li>PDF: <a href="pdf/live-manual.portrait-a4.pdf">A4 portrait</a>, <a
-href="pdf/live-manual.landscape-a4.pdf">A4 landscape</a>, <a
-href="pdf/live-manual.portrait-letter.pdf">letter portrait</a>, <a
-href="pdf/live-manual.landscape-letter.pdf">letter landscape</a></li>
- <li><a href="txt/live-manual.txt">Plain text</a></li>
+ <li><a href="epub/live-manual.en.epub">EPUB</a></li>
+ <li>HTML: <a href="html/index.en.html">multi page</a>, <a
+href="html/live-manual.en.html">single page</a></li>
+ <li><a href="odf/live-manual.en.odt">ODF</a></li>
+ <li>PDF: <a href="pdf/live-manual.portrait-a4.en.pdf">A4 portrait</a>, <a
+href="pdf/live-manual.landscape-a4.en.pdf">A4 landscape</a>, <a
+href="pdf/live-manual.portrait-letter.en.pdf">letter portrait</a>, <a
+href="pdf/live-manual.landscape-letter.en.pdf">letter landscape</a></li>
+ <li><a href="txt/live-manual.en.txt">Plain text</a></li>
</ul>
<p>
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index bdb8c91..89a2a6e 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-11-06
+ :published: 2011-11-07
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/user_customization-contents.ssi b/manual/ro/user_customization-contents.ssi
index 814ba40..e7d92bd 100644
--- a/manual/ro/user_customization-contents.ssi
+++ b/manual/ro/user_customization-contents.ssi
@@ -42,15 +42,15 @@ files that can be simply added or replaced in the image without processing;
see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
needed.
-To include files, simply add them to your #{config/chroot_local-includes}#
+To include files, simply add them to your #{config/includes.chroot}#
directory. This directory corresponds to the root directory (#{/}#) of the
live system. For example, to add a file #{/var/www/index.html}# in the live
system, use:
code{
- $ mkdir -p config/chroot_local-includes/var/www
- $ cp /path/to/my/index.html config/chroot_local-includes/var/www
+ $ mkdir -p config/includes.chroot/var/www
+ $ cp /path/to/my/index.html config/includes.chroot/var/www
}code
@@ -60,7 +60,7 @@ code{
-- config
[...]
- |-- chroot_local-includes
+ |-- includes.chroot
| `-- var
| `-- www
| `-- index.html
@@ -80,11 +80,11 @@ booting the Live system, you can use binary local includes. This works in a
similar fashion to chroot local includes. For example, suppose the files
#{~/video_demo.*}# are demo videos of the live system described by and
linked to by an HTML index page. Simply copy the material to
-#{config/binary_local-includes/}# as follows:
+#{config/includes.binary/}# as follows:
code{
- $ cp ~/video_demo.* config/binary_local-includes/
+ $ cp ~/video_demo.* config/includes.binary/
}code
@@ -128,7 +128,7 @@ explained in the "Customization" section of its man page. Examine
live-config's own hooks provided in #{/lib/live/config/}#, noting the
sequence numbers. Then provide your own hook prefixed with an appropriate
sequence number, either as a chroot local include in
-#{config/chroot_local-includes/lib/live/config/}#, or as a custom package as
+#{config/includes.chroot/lib/live/config/}#, or as a custom package as
discussed in {Installing modified or third-party
packages}#installing-modified-or-third-party-packages.
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 8860bc8..568ef99 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -463,7 +463,7 @@ with:
code{
- $ lb config --binary-indices false
+ $ lb config --apt-indices false
}code
@@ -506,7 +506,7 @@ and #{aptitude}# for details.
For background, please first read the #{apt_preferences(5)}# man page. APT
pinning can be configured either for build time, or else for run time. For
the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/apt/preferences}#.
+#{config/includes.chroot/etc/apt/preferences}#.
Let's say you are building a Squeeze live system but need all the live
packages that end up in the binary image to be installed from Sid at build
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index 4bbf347..97dccb6 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -42,7 +42,7 @@ One possible way of changing the default password is by means of a hook as
described in {Boot-time hooks}#boot-time-hooks. In order to do that you can
use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#,
prefix it accordingly (e.g. 200-passwd) and add it to
-#{config/chroot_local-includes/lib/live/config/}#
+#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Customizing locale and language
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index eb2dac8..6cf6ccb 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -132,7 +132,7 @@ code{
lb config noauto \
--architecture i386 \
- --linux-flavours 686 \
+ --linux-flavours 686-pae \
--package-lists lxde \
"${@}"
@@ -148,7 +148,7 @@ code{
First, #{--architecture i386}# ensures that on our #{amd64}# build system,
we build a 32-bit version suitable for use on most machines. Second, we use
-#{--linux-flavours 686}# because we don't anticipate using this image on
+#{--linux-flavours 686-pae}# because we don't anticipate using this image on
much older systems. Third, we've chosen the #{lxde}# package list to give us
a minimal desktop. And finally, we have added two initial favourite
packages: #{iceweasel}# and #{xchat}#.
@@ -242,7 +242,7 @@ code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686 -p standard-x11 \
+ $ lb config -a i386 -k 686-pae -p standard-x11 \
--apt-recommends false
$ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
@@ -254,8 +254,8 @@ to port #{5901}# on a server at #{192.168.1.2}#:
code{
- $ mkdir -p config/chroot_local-includes/etc/skel
- $ cat >config/chroot_local-includes/etc/skel/.xsession <<END
+ $ mkdir -p config/includes.chroot/etc/skel
+ $ cat >config/includes.chroot/etc/skel/.xsession <<END
#!/bin/sh
/usr/bin/metacity &
@@ -292,7 +292,7 @@ packages will most likely produce a broken live system.
code{
- $ lb config -k 486 -p minimal --binary-indices false \
+ $ lb config -k 486 -p minimal --apt-indices false \
--memtest none --apt-recommends false --includes none
}code
@@ -311,8 +311,8 @@ by the default configuration in {Tutorial 1}#tutorial-1.
The biggest space-saver here, compared to building a standard image on an
#{i386}# architecture system, is to select only the #{486}# kernel flavour
-instead of the default #{-k "486 686"}#. Leaving off APT's indices with
-#{--binary-indices false}# also saves a fair amount of space, the tradeoff
+instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
+#{--apt-indices false}# also saves a fair amount of space, the tradeoff
being that you need to #{apt-get update}# before using apt in the live
system. Choosing the #{minimal}# package list leaves out the large
#{locales}# package and associated utilities. Dropping recommended packages
@@ -347,12 +347,8 @@ Now we can search for the appropriate tasks, first with:
code{
- $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese
- Description: Brazilian Portuguese environment
- This task installs programs, data files, and
- documentation that make it easier for Brazilian Portuguese speakers
- to use Debian.
}code
@@ -361,14 +357,9 @@ brazilian-portuguese. Now to find the related tasks:
code{
- $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description
+ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask
Task: brazilian-portuguese-desktop
- Description: Brazilian Portuguese desktop
- This task localises the desktop in Brasilian Portuguese.
-
Task: brazilian-portuguese-kde-desktop
- Description: Brazilian Portuguese KDE desktop
- This task localises the KDE desktop in Brazilian Portuguese.
}code
diff --git a/manual/ro/user_overview.ssi b/manual/ro/user_overview.ssi
index ddb3b58..ad40e60 100644
--- a/manual/ro/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -52,51 +52,20 @@ time-consuming and error-prone, the #{lb config}# command can be used to
create skeleton configuration folders.
Issuing #{lb config}# without any arguments creates a #{config/}#
-subdirectory which it populates with some default settings:
+subdirectory which it populates with some default settings, and a skeleton
+#{auto/}# subdirectory tree.
code{
$ lb config
+ P: Considering defaults defined in /etc/live/build.conf
P: Creating config tree
- $ ls -l
- total 8
- drwxr-xr-x 3 user user 4096 Sep 7 13:02 auto
- drwxr-xr-x 22 user user 4096 Sep 7 13:02 config
-
- $ ls -l config/
- total 104
- -rw-r--r-- 1 user user 4197 Sep 7 13:02 binary
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_debian-installer-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_grub
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-debs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_local-udebs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_rootfs
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 binary_syslinux
- -rw-r--r-- 1 user user 2051 Sep 7 13:02 bootstrap
- -rw-r--r-- 1 user user 1647 Sep 7 13:02 chroot
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_apt
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-hooks
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-includes
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packages
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-packageslists
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-patches
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_local-preseed
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 chroot_sources
- -rw-r--r-- 1 user user 2954 Sep 7 13:02 common
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 includes
- -rw-r--r-- 1 user user 205 Sep 7 13:02 source
- drwxr-xr-x 2 user user 4096 Sep 7 13:02 templates
-
}code
Using #{lb config}# without any arguments would be suitable for users who
need a very basic image, or who intend to later provide a more complete
-configuration via auto/config (see {Managing a
+configuration via #{auto/config}# (see {Managing a
configuration}#managing-a-configuration for details).
Normally, you will want to specify some options. For example, to include the
@@ -120,7 +89,7 @@ A full list of options is available in the #{lb_config}# man page.
3~lb-build The #{lb build}# command
-The #{lb build}# command reads in your configuration from the config/
+The #{lb build}# command reads in your configuration from the #{config/}#
directory. It then runs the lower level commands needed to build your Live
system.
@@ -141,10 +110,10 @@ initramfs-tools, used to generate an initramfs capable of booting live
systems, such as those created by live-build. This includes the Debian Live
ISOs, netboot tarballs, and USB stick images.
-At boot time it will look for read-only media containing a "/live" directory
-where a root filesystem (often a compressed filesystem image like squashfs)
-is stored. If found, it will create a writable environment, using aufs, for
-Debian like systems to boot from.
+At boot time it will look for read-only media containing a #{/live/}#
+directory where a root filesystem (often a compressed filesystem image like
+squashfs) is stored. If found, it will create a writable environment, using
+aufs, for Debian like systems to boot from.
More information on initial ramfs in Debian can be found in the Debian Linux
Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter
--
live-manual
More information about the debian-live-changes
mailing list