[SCM] live-manual branch, debian-next, updated. debian/3.0_a14-1-29-g719ca98
chals
chals at altorricon.com
Mon Aug 6 21:54:04 UTC 2012
The following commit has been merged in the debian-next branch:
commit 719ca988ca7a0106d71366f469748388bec926a7
Author: chals <chals at altorricon.com>
Date: Mon Aug 6 23:54:50 2012 +0200
Running 'make commit' to avoid conflicts and thus being able to commit languages individually afterwards; there are too many changes to cope with them all.
diff --git a/manual/ca/project_bugs.ssi b/manual/ca/project_bugs.ssi
index c4e404f..b7bc7b6 100644
--- a/manual/ca/project_bugs.ssi
+++ b/manual/ca/project_bugs.ssi
@@ -3,9 +3,9 @@ B~ Reporting bugs
1~bugs Reporting bugs
Debian Live is far from being perfect, but we want to make it as close as
-possible to perfect - with your help. Do not hesitate to report a bug: it is
+possible to perfect - with your help. Do not hesitate to report a bug. It is
better to fill a report twice than never. However, this chapter includes
-recommendations how to file good bug reports.
+recommendations on how to file good bug reports.
Per als impacients
@@ -22,15 +22,15 @@ live-tools used and the distribution of the live system you are building.
2~ Known issues
-Because Debian *{testing}* and Debian *{unstable}* distributions are a
-moving target, when you specify either as the target system distribution, a
-successful build may not always be possible.
+Since Debian *{testing}* and Debian *{unstable}* distributions are moving
+targets, when you specify either of them as the target system distribution,
+a successful build may not always be possible.
% FIXME:
If this causes too much difficulty for you, do not build a system based on
-*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does
-always default to the *{stable}* release.
+*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always
+defaults to the *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage
at http://live.debian.net/.
@@ -56,9 +56,9 @@ up-to-date and any packages included in your image are up-to-date as well.
2~collect-information Collect information
-Please provide enough information with your report. At least include the
-exact version of live-build version where the bug is encountered and steps
-to reproduce it. Please use common sense and include other relevant
+Please provide enough information with your report. Include, at least, the
+exact version of live-build where the bug is encountered and the steps to
+reproduce it. Please use your common sense and provide any other relevant
information if you think that it might help in solving the problem.
To make the most out of your bug report, we require at least the following
@@ -83,7 +83,7 @@ _* Distribution of the live system
_* Version of the kernel on the live system
You can generate a log of the build process by using the #{tee}# command. We
-recommend doing this automatically with an #{auto/build}# script; (see
+recommend doing this automatically with an #{auto/build}# script (see
{Managing a configuration}#managing-a-configuration for details).
code{
@@ -109,9 +109,9 @@ settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or
2~ Isolate the failing case if possible
If possible, isolate the failing case to the smallest possible change that
-breaks. It is not always easy to do this, so if you can't manage it for your
-report, don't worry. However, if you plan your development cycle well, using
-small enough change sets per iteration, you may be able to isolate the
+breaks. It is not always easy to do this so if you cannot manage it for your
+report, do not worry. However, if you plan your development cycle well,
+using small enough change sets per iteration, you may be able to isolate the
problem by constructing a simpler 'base' configuration that closely matches
your actual configuration plus just the broken change set added to it. If
you have a hard time sorting out which of your changes broke, it may be that
@@ -120,12 +120,12 @@ increments.
2~ Use the correct package to report the bug against
-If you don't know what component is responsible for the bug or if the bug is
-a general bug concerning live systems, you can fill a bug against the
+If you do not know what component is responsible for the bug or if the bug
+is a general bug concerning live systems, you can fill a bug against the
debian-live pseudo-package.
-However, we would appreciate if you try to narrow it down according to where
-the bug appears.
+However, we would appreciate it if you try to narrow it down according to
+where the bug appears.
3~ At build time whilst bootstrapping
@@ -133,10 +133,10 @@ live-build first bootstraps a basic Debian system with /{debootstrap}/ or
/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
distribution it is bootstrapping, it may fail. If a bug appears here, check
if the error is related to a specific Debian package (most likely), or if it
-is related to bootstrapping tool itself.
+is related to the bootstrapping tool itself.
In both cases, this is not a bug in Debian Live, but rather in Debian itself
-which we can not fix this directly. Please report such a bug against the
+and probably we cannot fix it directly. Please report such a bug against the
bootstrapping tool or the failing package.
3~ At build time whilst installing packages
@@ -151,31 +151,31 @@ If this is the case, this is not a bug in Debian Live, but rather in Debian
separately from the Live system build or running #{lb bootstrap --debug}#
will give you more information.
-Also, if you are using a local mirror and/or any of sort of proxy and you
-are experiencing a problem, please always reproduce it first by
-bootstrapping from an official mirror.
+Also, if you are using a local mirror and/or any sort of proxy and you are
+experiencing a problem, please always reproduce it first by bootstrapping
+from an official mirror.
3~ At boot time
If your image does not boot, please report it to the mailing list together
with the information requested in {Collect
information}#collect-information. Do not forget to mention, how/when the
-image failed, in Qemu, Virtualbox, VMWare or real hardware. If you are using
-a virtualization technology of any kind, please always run it on real
-hardware before reporting a bug. Providing a screenshot of the failure is
-also very helpful.
+image failed, whether in Qemu, Virtualbox, VMWare or real hardware. If you
+are using a virtualization technology of any kind, please always run it on
+real hardware before reporting a bug. Providing a screenshot of the failure
+is also very helpful.
3~ At run time
If a package was successfully installed, but fails while actually running
-the Live system, this is probably a bug in Debian Live. However,
+the Live system, this is probably a bug in Debian Live. However:
2~ Do the research
Before filing the bug, please search the web for the particular error
message or symptom you are getting. As it is highly unlikely that you are
-the only person experiencing a particular problem, there is always a chance
-that it has been discussed elsewhere, and a possible solution, patch, or
+the only person experiencing a particular problem. There is always a chance
+that it has been discussed elsewhere and a possible solution, patch, or
workaround has been proposed.
You should pay particular attention to the Debian Live mailing list, as well
@@ -185,7 +185,7 @@ in your bug report.
In addition, you should check the current bug lists for live-build,
live-boot, live-config and live-tools to see whether something similar has
-been reported already.
+already been reported.
2~ Where to report bugs
diff --git a/manual/ca/user_customization-contents.ssi b/manual/ca/user_customization-contents.ssi
index c6f1572..de106e2 100644
--- a/manual/ca/user_customization-contents.ssi
+++ b/manual/ca/user_customization-contents.ssi
@@ -16,7 +16,7 @@ Tot i que l'ideal seria un sistema Debian Live que inclogués només fitxers
proporcionats per paquets Debian sense modificació, de vegades és convenient
proporcionar o modificar part del contingut a través de fitxers. Amb els
includes, és possible afegir (o substituir) fitxers arbitraris en la imatge
-Debian Live. live-build ofereix tres mecanismes per al seu ús:
+Debian Live. live-build ofereix dos mecanismes per al seu ús:
_* Chroot local includes: Aquests permeten afegir o substituir fitxers
dintre de chroot/Live en el sistema de fitxers. Consultar {Live/chroot local
@@ -26,11 +26,6 @@ _* Binary local includes: Aquests et permeten afegir o substituir fitxers a
la imatge binària. Consultar {Binary local includes}#binary-local-includes
per a més informació.
-_* Binary includes: Aquests et permeten afegir o substituir els fitxers
-específics de Debian a la imatge binària, com ara les plantilles i
-directoris d'eines. Consultar {Binary includes}#binary-includes per a més
-informació.
-
Consultar {Termes}#terms per a més informació sobre la distinció entre les
imatges "Live" and "binary".
@@ -94,22 +89,6 @@ code{
Aquests fitxers apareixeran ara en el directori arrel dels medis en viu.
-3~binary-includes Binary includes
-
-live-build té alguns fitxers estàndard (com ara la documentació) que
-s'inclouen en la configuració per defecte de tots els medis en viu. Això es
-pot desactivar amb:
-
-code{
-
- $ lb config --includes none
-
-}code
-
-En cas contrari, el material serà instaŀlat per live-build a #{/includes/}#
-per defecte en el sistema de fitxers dels medis o bé es pot especificar una
-ruta alternativa amb l'opció #{--includes}#.
-
2~hooks Scripts ganxo (Hooks)
Els scripts ganxo permeten executar ordres en les etapes de la construcció
diff --git a/manual/ca/user_customization-packages.ssi b/manual/ca/user_customization-packages.ssi
index afc2d19..736f8a0 100644
--- a/manual/ca/user_customization-packages.ssi
+++ b/manual/ca/user_customization-packages.ssi
@@ -250,14 +250,14 @@ instaŀlador non-live. Com s'ha esmentat anteriorment, si es vol que aquesta
llista sigui la mateixa que la llista de l'etapa chroot, simplement
utilitzar el sufix #{.list}#.
-3~ Llistes de paquets generades
+3~package-lists Generar llistes de paquets
De vegades passa que la millor manera de crear una llista és generar-la amb
un script. Qualsevol línia que comença amb un signe d'exclamació indica una
ordre que s'executarà dins del chroot quan la imatge es construeix. Per
exemple, es podria incloure la línia #{! grep-aptavail -n -sPackage
--FPriority standard | sort}# en una llista de paquets per per produir una
-llista ordenada de paquets disponibles amb #{Priority: standard}#.
+-FPriority standard | sort}# en una llista de paquets per produir una llista
+ordenada de paquets disponibles amb #{Priority: standard}#.
De fet, la selecció de paquets amb l'ordre #{grep-aptavail}# (del paquet
#{dctrl-tools}#) és tan útil que #{live-build}# proporciona un script
diff --git a/manual/ca/user_customization-runtime.ssi b/manual/ca/user_customization-runtime.ssi
index 36d0371..55aad83 100644
--- a/manual/ca/user_customization-runtime.ssi
+++ b/manual/ca/user_customization-runtime.ssi
@@ -81,14 +81,14 @@ la forma completa #{language_country.encoding}#. Una llista de locales
suportades i la codificació per a cadascuna es poden trobar a
#{/usr/share/i18n/SUPPORTED}#.
-Both the console and X keyboard configuration are performed by
-#{live-config}# using the #{console-setup}# package. To configure them, use
-the #{keyboard-layouts}#, #{keyboard-variants}#, #{keyboard-options}# and
-#{keyboard-model}# boot parameters via the #{--bootappend-live}#
-option. Valid options for these can be found in
-#{/usr/share/X11/xkb/rules/base.lst}#. To find layouts and variants for a
-given language, try searching for the English name of the language and/or
-the country where the language is spoken, e.g:
+#{live-config}# s'encarrega de la configuració del teclat per X i per la
+consola utilitzant el paquet #{console-setup}#. Per la seva configuració es
+por fer servir els paràmetres d'arrencada #{keyboard-layouts}#,
+#{keyboard-variants}#, #{keyboard-options}# i #{keyboard-model}# mitjançant
+l'opció #{--bootappend-live}#. Es poden trobar opcions vàlides per a aquests
+a #{/usr/share/X11/xkb/rules/base.lst}#. Per trobar distribucions de teclat
+i variants per a un idioma determinat, s'ha d'intentar cercar el nom en
+anglès de la llengua i/o el país on es parla l'idioma, per exemple:
code{
@@ -130,15 +130,15 @@ code{
}code
-Multiple values may be specified as comma-delimited lists for each of the
-#{keyboard-*}# options, with the exception of #{keyboard-model}#, which
-accepts only one value. Please see the #{keyboard(5)}# man page for details
-and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and
-#{XKBOPTIONS}# variables. If multiple #{keyboard-variants}# values are
-given, they will be matched one-to-one with #{keyboard-layouts}# values (see
-#{setxkbmap(1)}# #{-variant}# option). Empty values are allowed; e.g. to
-define two layouts, the default being US QWERTY and the other being US
-Dvorak, use:
+Es poden especificar diversos valors per a cada una de les opcions
+#{keyboard-*}# en una llista separada per comes amb l'excepció de
+#{keyboard-model}#, que només accepta un valor. Veure la pàgina de manual
+#{keyboard(5)}# per a més detalls i exemples de les variables #{XKBMODEL}#,
+#{XKBLAYOUT}#, #{XKBVARIANT}# y #{XKBOPTIONS}#. Si s'especifican diversos
+valors de #{keyboard-variants}# es correspondran un a un amb els valors
+#{keyboard-layouts}# (veure #{setxkbmap(1)}# opció #{-variant}#). Es poden
+utilitzar valors buits, per exemple, per definir dos dissenys, el valor
+predeterminat US QWERTY i l'altre US Dvorak:
code{
diff --git a/manual/ca/user_examples.ssi b/manual/ca/user_examples.ssi
index 25a1fb7..7c94217 100644
--- a/manual/ca/user_examples.ssi
+++ b/manual/ca/user_examples.ssi
@@ -79,8 +79,7 @@ code{
$ mkdir tutorial2
$ cd tutorial2
- $ lb config -p lxde
- $ echo iceweasel >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel" >> config/package-lists/my.list.chroot
}code
@@ -133,7 +132,6 @@ code{
lb config noauto \
--architectures i386 \
--linux-flavours 686-pae \
- --package-lists lxde \
"${@}"
}code
@@ -151,15 +149,15 @@ Now populate your local package list:
code{
- $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel xchat" >> config/package-lists/my.list.chroot
}code
First, #{--architectures 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
+much older systems. Third, we have chosen the /{lxde}/ task metapackage to
+give us a minimal desktop. And finally, we have added two initial favourite
packages: /{iceweasel}/ and /{xchat}/.
Now, build the image:
@@ -243,23 +241,27 @@ cases drawn from the collected experiences of users of Debian Live.
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
-Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
-/{xvnc4viewer}/, disabling recommends to make a minimal system:
+Make a build directory and create an skeletal configuration inside it,
+disabling recommends to make a minimal system. And then create two package
+lists: the first one generated with a script provided by live-build named
+#{Packages}# (see {Generated package lists}#generated-package-lists), and
+the second one including /{xorg}/, /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/.
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686-pae -p standard-x11 \
- --apt-recommends false
- $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
+ $ lb config -a i386 -k 686-pae --apt-recommends false
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo "xorg gdm3 metacity xvnc4viewer" > config/package-lists/my.list.chroot
}code
-Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch /{metacity}/ and start /{xvncviewer}/,
-connecting to port #{5901}# on a server at #{192.168.1.2}#:
+Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a
+custom #{.xsession}# in it for the default user that will launch
+/{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a
+server at #{192.168.1.2}#:
code{
@@ -287,22 +289,21 @@ Enjoy.
2~ A base image for a 128M USB key
-*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.
When optimizing an image to fit a certain media size, you need to understand
the tradeoffs you are making between size and functionality. In this
example, we trim only so much as to make room for additional material within
-a 128M media size, but without doing anything to destroy integrity of the
-packages contained within, such as the purging of locale data via the
+a 128M media size, but without doing anything to destroy the integrity of
+the packages contained within, such as the purging of locale data via the
/{localepurge}/ package, or other such "intrusive" optimizations. Of
-particular note, you should not use #{--bootstrap-flavour minimal}# unless
-you really know what you're doing, as omitting priority *{important}*
-packages will most likely produce a broken live system.
+particular note, in order to understand what the #{minimal.chroot}# hook
+does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
}code
@@ -314,23 +315,27 @@ code{
}code
-On the author's system at time of writing, the above configuration produced
-a 78Mbyte image. This compares favourably with the 166Mbyte image produced
-by the default configuration in {Tutorial 1}#tutorial-1.
+On the author's system at the time of writing this, the above configuration
+produced a 95Mbyte image. This compares favourably with the 182Mbyte image
+produced 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-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.
+system. 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. #{--memtest none}# prevents the
+installation of a memory tester. And finally, the execution of the
+#{minimal}# hook removes some unused packages and files.
+
+Using other hooks, like for example the #{stripped.chroot}# hook found in
+#{/usr/share/doc/live-build/examples/hooks}#, may shave off additional small
+amounts of space and produce an image of 76MB. But it is up to you to decide
+if the functionality that is sacrificed with each size optimization is worth
+the loss of functionality.
2~ A localized KDE desktop and installer
diff --git a/manual/ca/user_managing_a_configuration.ssi b/manual/ca/user_managing_a_configuration.ssi
index 79d297e..54bcf85 100644
--- a/manual/ca/user_managing_a_configuration.ssi
+++ b/manual/ca/user_managing_a_configuration.ssi
@@ -8,90 +8,119 @@ el programari live-build com de la imatge en viu en si mateixa.
2~ Utilitzar auto per gestionar canvis de configuració
-Les configuracions dels sistemes vius poques vegades són perfectes al primer
-intent. És probable que s'hagi de fer una sèrie de revisions fins quedar
-satisfet. No obstant això, es poden introduir inconsistències a la
-configuració d'una versió a la següent si no se'n te cura. El principal
-problema és, que una vegada que a una variable se li assigna un valor per
-defecte, aquest valor no es torna a calcular a partir d'altres variables que
-poden canviar en revisions posteriors.
-
-Per exemple, quan la distribució s'estableix per primer cop, a moltes de les
-variables dependents se'ls assigna uns valors per defecte que s'adapten a
-aquesta distribució. No obstant això, si més endavant es decideix canviar la
-distribució, les variables dependents seguiran conservant els mateixos
-valors que ja no són apropiats.
-
-Un segon problema relacionat és que si s'executa #{lb config}# i després
-s'actualitza a una versió nova de live-build que ha canviat un dels noms de
-les variables, només es descobrirà això mitjantçant una revisió manual de
-les variables als fitxers de #{config/*}# que després s'hauran de tornar a
-modificar per establir l'opció corresponent de nou.
-
-Tot això seria una molestia terrible si no fos pels scripts auto/*, simples
-embolcalls per les ordres #{lb config}#, #{lb build}# i #{lb clean}#
-dissenyats per ajudar a gestionar una configuració. Només cal crear un
-script auto/config que contingui totes les opcions que es desitgin, i un
-auto/clean que elimini els fitxers que continguin diversos valors de
-variables de configuració, cada vegada que s'executi #{lb config}# i #{lb
-clean}#, aquests fitxers seran executats. Això assegurarà que la
-configuració guarda una coherència interna d'una versió a una altra i d'una
-versió de live-build a la següent (Tot i que encara s'haurà d'anar amb
-compte i llegir la documentació quan s'actualitzi live-build i fer els
-ajustos necessaris ).
-
-2~ Scripts auto d'exemple
-
-Es poden utilitzar scripts auto d'exemple com ara els següents com a punt de
-partida per crear una nova configuració de live-build. Tenir en compte que
-quan s'invoca l'ordre #{lb}# que embolcalla el script auto, s'ha
-d'especificar #{noauto}# com a paràmetre per garantir que el script auto no
-es torna a executar de forma recursiva. A més, assegurar-se que els scripts
-són fitxers executables (e.g. #{chmod 755 auto/*}#).
-
-#{auto/config}#
+Live configurations rarely are perfect on the first try. It may be fine to
+pass #{lb config}# options from the command-line to perform a single build,
+but it is more typical to revise those options and build again until you are
+satisfied. To support these changes, you will need auto scripts which ensure
+your configuration is kept in a consistent state.
+
+3~ Why you need auto
+
+The #{lb config}# command stores the options you pass to it in #{config/*}#
+files along with many other options set to default values. If you run #{lb
+config}# again, it will not reset any option that was defaulted based on
+your initial options. So, for example, if you run #{lb config}# again with a
+new value for #{--distribution}#, any dependent options that were defaulted
+for the old distribution may no longer work with the new. Nor are these
+files intended to be read or edited. They store values for over a hundred
+options, so nobody, let alone yourself, will be able to see in these which
+options you actually specified. And finally, if you run #{lb config}#, then
+upgrade live-build and it happens to rename an option, #{config/*}# would
+still contain variables named after the old option that are no longer valid.
+
+ Per totes aquestes raons, els scripts #{auto/*}# ens fan la vida més
+fàcil. Són simples embolcalls per les ordres #{lb config}#, #{lb build}# i
+#{lb clean}# dissenyats per ajudar a gestionar una configuració. Només cal
+crear un script #{auto/config}# que contingui totes les opcions que es
+desitgin per a #{lb config}#, i un #{auto/clean}# que elimini els fitxers
+que continguin diversos valors de variables de configuració, i el script
+#{auto/build}# guarda un #{build.log}# de cada construcció. Cada vegada que
+s'executi l'ordre #{lb}# corresponent, aquests fitxers seran executats
+automàticament. L'ús d'aquests scripts assegurarà que la configuració sigui
+més senzilla de llegir i que guardi una coherència interna d'una reversió a
+una altra. A més a més serà més fàcil identificar i solucionar les opcions
+que s'han de canviar al actualitzar d'una versió de live-build a la següent
+després de llegir la documentació.
+
+2~ Utilitzar scripts auto d'exemple
+
+For your convenience, live-build comes with example auto shell scripts to
+copy and edit. Start a new, default configuration, then copy the examples
+into it:
+
+code{
+
+ $ mkdir mylive && cd mylive && lb config
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
+
+}code
+
+Edit #{auto/config}#, adding any options as you see fit. For instance:
code{
#!/bin/sh
lb config noauto \
- --package-lists "standard" \
+ --architectures i386 \
+ --linux-flavours 686-pae \
+ --binary-images hdd \
+ --mirror-bootstrap http://ftp.es.debian.org/debian/ \
+ --mirror-binary http://ftp.es.debian.org/debian/ \
"${@}"
}code
-#{auto/clean}#
+Now, each time you use #{lb config}#, #{auto/config}# will reset the
+configuration based on these options. When you want to make changes to them,
+edit the options in this file instead of passing them to #{lb config}#. When
+you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files
+along with any other build products. And finally, when you use #{lb build}#,
+a log of the build will be written by #{auto/build}# in #{build.log}#.
+
+Note: A special #{noauto}# parameter is used here to suppress another call
+to #{auto/config}#, thereby preventing infinite recursion. Make sure you
+don't accidentally remove it when making edits. Also, take care to ensure
+when you split the #{lb config}# command across multiple lines for
+readability, as shown in the example above, that you don't forget the
+backslash (\) at the end of each line that continues to the next.
+
+2~ Clone a configuration published via Git
+
+Utilitzar l'opció #{lb config --config}# opció per clonar un repositori Git
+que contingui una configuració de Debian Live. Si es vol basar la
+configuració en un repositori mantingut pel projecte Debian Live, mirar els
+repositoris amb el prefix #{config-}# a http://live.debian.net/gitweb
+
+Per exemple, per construir una imatge de rescat, utilitzar el repositori
+#{config-rescue}# de la manera següent:
code{
- #!/bin/sh
- lb clean noauto "${@}"
- rm -f config/binary config/bootstrap \
- config/chroot config/common config/source
- rm -f build.log
+ $ mkdir live-rescue && cd live-rescue
+ $ lb config git://live.debian.net/git/config-rescue.git
}code
-#{auto/build}#
+Editar #{auto/config}# i qualsevol altra cosa necessària dins l'arbre
+#{config}# per satisfer les vostres necessitats.
+
+Si es desitja, es pot definir una drecera en la configuració de Git, afegint
+el següent a #{${HOME}/.gitconfig}#:
code{
- #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee build.log
+ [url "git://live.debian.net/git/"]
+ insteadOf = ldn:
}code
-Ara incloem scripts auto d'exemple amb live-build basats en els exemples
-anteriors. Es poden copiar com a punt de partida.
+Això permet utilitzar #{ldn:}# en qualsevol lloc on cal especificar la
+direcció d'un repositori git. També es pot omitir el sufix #{.git}#,
+començar una nova imatge amb aquesta configuració és tan fàcil com:
code{
- $ cp /usr/share/doc/live-build/examples/auto/* auto/
+ $ lb config ldn:config-rescue
}code
-Editar #{auto/config}#, canviar o afegir qualsevol opció que millor
-sembli. En l'exemple anterior s'estableix el valor per defecte,
-#{--package-lists standard}#. Canviar això a qualsevol valor vàlid per la
-pròpia imatge (o suprimir-ho si es vol utilitzar el valor per defecte) i
-afegir opcions addicionals en les línies que segueixen a continuació.
diff --git a/manual/ca/user_overview.ssi b/manual/ca/user_overview.ssi
index d5b0676..0d94cf3 100644
--- a/manual/ca/user_overview.ssi
+++ b/manual/ca/user_overview.ssi
@@ -59,9 +59,9 @@ subdirectoris #{auto/}#.
code{
$ lb config
- [2012-03-19 15:17:14] lb_config
+ [2012-08-03 22:59:17] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree for a debian system
+ P: Creating config tree for a debian/i386 system
}code
@@ -71,12 +71,13 @@ proporcionar una configuració més completa més tard mitjançant
#{auto/config}# (Veure {Gestió d'una configuració}#managing-a-configuration
per més detalls).
-Normalment, s'haurà d'especificar algunes opcions. Per exemple, per incloure
-la llista de paquets 'gnome' en la configuració:
+Normalment, s'haurà d'especificar algunes opcions. Per exemple, per
+especificar quina distribució es vol construir mitjançant el seu nom en
+clau:
code{
- $ lb config -p gnome
+ $ lb config --distribution sid
}code
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 27d40a5..bead973 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäss Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.<br><br>Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.<br><br>Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.<br><br>Der komplette Text der GNU General Public License kann in der Datei /usr/share/common-licenses/GPL-3 gefunden werden.
@date:
- :published: 02.08.2012
+ :published: 06.08.2012
@publisher: Debian Live Projekt <debian-live at lists.debian.org>
diff --git a/manual/de/project_bugs.ssi b/manual/de/project_bugs.ssi
index eec3466..264dbba 100644
--- a/manual/de/project_bugs.ssi
+++ b/manual/de/project_bugs.ssi
@@ -3,9 +3,9 @@ B~ Reporting bugs
1~bugs Reporting bugs
Debian Live is far from being perfect, but we want to make it as close as
-possible to perfect - with your help. Do not hesitate to report a bug: it is
+possible to perfect - with your help. Do not hesitate to report a bug. It is
better to fill a report twice than never. However, this chapter includes
-recommendations how to file good bug reports.
+recommendations on how to file good bug reports.
For the impatient:
@@ -22,15 +22,15 @@ live-tools used and the distribution of the live system you are building.
2~ Known issues
-Because Debian *{testing}* and Debian *{unstable}* distributions are a
-moving target, when you specify either as the target system distribution, a
-successful build may not always be possible.
+Since Debian *{testing}* and Debian *{unstable}* distributions are moving
+targets, when you specify either of them as the target system distribution,
+a successful build may not always be possible.
% FIXME:
If this causes too much difficulty for you, do not build a system based on
-*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does
-always default to the *{stable}* release.
+*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always
+defaults to the *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage
at http://live.debian.net/.
@@ -56,9 +56,9 @@ up-to-date and any packages included in your image are up-to-date as well.
2~collect-information Collect information
-Please provide enough information with your report. At least include the
-exact version of live-build version where the bug is encountered and steps
-to reproduce it. Please use common sense and include other relevant
+Please provide enough information with your report. Include, at least, the
+exact version of live-build where the bug is encountered and the steps to
+reproduce it. Please use your common sense and provide any other relevant
information if you think that it might help in solving the problem.
To make the most out of your bug report, we require at least the following
@@ -83,7 +83,7 @@ _* Distribution of the live system
_* Version of the kernel on the live system
You can generate a log of the build process by using the #{tee}# command. We
-recommend doing this automatically with an #{auto/build}# script; (see
+recommend doing this automatically with an #{auto/build}# script (see
{Managing a configuration}#managing-a-configuration for details).
code{
@@ -109,9 +109,9 @@ settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or
2~ Isolate the failing case if possible
If possible, isolate the failing case to the smallest possible change that
-breaks. It is not always easy to do this, so if you can't manage it for your
-report, don't worry. However, if you plan your development cycle well, using
-small enough change sets per iteration, you may be able to isolate the
+breaks. It is not always easy to do this so if you cannot manage it for your
+report, do not worry. However, if you plan your development cycle well,
+using small enough change sets per iteration, you may be able to isolate the
problem by constructing a simpler 'base' configuration that closely matches
your actual configuration plus just the broken change set added to it. If
you have a hard time sorting out which of your changes broke, it may be that
@@ -120,12 +120,12 @@ increments.
2~ Use the correct package to report the bug against
-If you don't know what component is responsible for the bug or if the bug is
-a general bug concerning live systems, you can fill a bug against the
+If you do not know what component is responsible for the bug or if the bug
+is a general bug concerning live systems, you can fill a bug against the
debian-live pseudo-package.
-However, we would appreciate if you try to narrow it down according to where
-the bug appears.
+However, we would appreciate it if you try to narrow it down according to
+where the bug appears.
3~ At build time whilst bootstrapping
@@ -133,10 +133,10 @@ live-build first bootstraps a basic Debian system with /{debootstrap}/ or
/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
distribution it is bootstrapping, it may fail. If a bug appears here, check
if the error is related to a specific Debian package (most likely), or if it
-is related to bootstrapping tool itself.
+is related to the bootstrapping tool itself.
In both cases, this is not a bug in Debian Live, but rather in Debian itself
-which we can not fix this directly. Please report such a bug against the
+and probably we cannot fix it directly. Please report such a bug against the
bootstrapping tool or the failing package.
3~ At build time whilst installing packages
@@ -151,31 +151,31 @@ If this is the case, this is not a bug in Debian Live, but rather in Debian
separately from the Live system build or running #{lb bootstrap --debug}#
will give you more information.
-Also, if you are using a local mirror and/or any of sort of proxy and you
-are experiencing a problem, please always reproduce it first by
-bootstrapping from an official mirror.
+Also, if you are using a local mirror and/or any sort of proxy and you are
+experiencing a problem, please always reproduce it first by bootstrapping
+from an official mirror.
3~ At boot time
If your image does not boot, please report it to the mailing list together
with the information requested in {Collect
information}#collect-information. Do not forget to mention, how/when the
-image failed, in Qemu, Virtualbox, VMWare or real hardware. If you are using
-a virtualization technology of any kind, please always run it on real
-hardware before reporting a bug. Providing a screenshot of the failure is
-also very helpful.
+image failed, whether in Qemu, Virtualbox, VMWare or real hardware. If you
+are using a virtualization technology of any kind, please always run it on
+real hardware before reporting a bug. Providing a screenshot of the failure
+is also very helpful.
3~ At run time
If a package was successfully installed, but fails while actually running
-the Live system, this is probably a bug in Debian Live. However,
+the Live system, this is probably a bug in Debian Live. However:
2~ Do the research
Before filing the bug, please search the web for the particular error
message or symptom you are getting. As it is highly unlikely that you are
-the only person experiencing a particular problem, there is always a chance
-that it has been discussed elsewhere, and a possible solution, patch, or
+the only person experiencing a particular problem. There is always a chance
+that it has been discussed elsewhere and a possible solution, patch, or
workaround has been proposed.
You should pay particular attention to the Debian Live mailing list, as well
@@ -185,7 +185,7 @@ in your bug report.
In addition, you should check the current bug lists for live-build,
live-boot, live-config and live-tools to see whether something similar has
-been reported already.
+already been reported.
2~ Where to report bugs
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index e6237cf..fb0ce3b 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -14,8 +14,8 @@ installed by supplying answers to debconf questions.
While ideally a Debian live system would include files entirely provided by
unmodified Debian packages, it is sometimes convenient to provide or modify
some content by means of files. Using includes, it is possible to add (or
-replace) arbitrary files in your Debian Live image. live-build provides
-three mechanisms for using them:
+replace) arbitrary files in your Debian Live image. live-build provides two
+mechanisms for using them:
_* Chroot local includes: These allow you to add or replace files to the
chroot/Live filesystem. Please see {Live/chroot local
@@ -25,10 +25,6 @@ _* Binary local includes: These allow you to add or replace files in the
binary image. Please see {Binary local includes}#binary-local-includes for
more information.
-_* Binary includes: These allow you to add or replace Debian specific files
-in the binary image, such as the templates and tools directories. Please see
-{Binary includes}#binary-includes for more information.
-
Please see {Terms}#terms for more information about the distinction between
the "Live" and "binary" images.
@@ -90,21 +86,6 @@ code{
These files will now appear in the root directory of the live media.
-3~binary-includes Binary includes
-
-live-build has some standard files (like documentation) that gets included
-in the default configuration on every live media. This can be disabled with:
-
-code{
-
- $ lb config --includes none
-
-}code
-
-Otherwise, the material will be installed by live-build in #{/includes/}# by
-default on the media filesystem, or else you can specify an alternate path
-with #{--includes}#.
-
2~hooks Hooks
Hooks allow commands to be performed in the chroot and binary stages of the
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 1f93ddf..2b706a5 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -234,7 +234,7 @@ typically use such a list with one of the non-live installer variants. As
mentioned above, if you want this list to be the same as your chroot stage
list, simply use the #{.list}# suffix by itself.
-3~ Generated package lists
+3~generated-package-lists Generated package lists
It sometimes happens that the best way to compose a list is to generate it
with a script. Any line starting with an exclamation point indicates a
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 933cb24..bb9462d 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -79,8 +79,7 @@ code{
$ mkdir tutorial2
$ cd tutorial2
- $ lb config -p lxde
- $ echo iceweasel >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel" >> config/package-lists/my.list.chroot
}code
@@ -133,7 +132,6 @@ code{
lb config noauto \
--architectures i386 \
--linux-flavours 686-pae \
- --package-lists lxde \
"${@}"
}code
@@ -151,15 +149,15 @@ Now populate your local package list:
code{
- $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel xchat" >> config/package-lists/my.list.chroot
}code
First, #{--architectures 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
+much older systems. Third, we have chosen the /{lxde}/ task metapackage to
+give us a minimal desktop. And finally, we have added two initial favourite
packages: /{iceweasel}/ and /{xchat}/.
Now, build the image:
@@ -243,23 +241,27 @@ cases drawn from the collected experiences of users of Debian Live.
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
-Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
-/{xvnc4viewer}/, disabling recommends to make a minimal system:
+Make a build directory and create an skeletal configuration inside it,
+disabling recommends to make a minimal system. And then create two package
+lists: the first one generated with a script provided by live-build named
+#{Packages}# (see {Generated package lists}#generated-package-lists), and
+the second one including /{xorg}/, /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/.
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686-pae -p standard-x11 \
- --apt-recommends false
- $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
+ $ lb config -a i386 -k 686-pae --apt-recommends false
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo "xorg gdm3 metacity xvnc4viewer" > config/package-lists/my.list.chroot
}code
-Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch /{metacity}/ and start /{xvncviewer}/,
-connecting to port #{5901}# on a server at #{192.168.1.2}#:
+Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a
+custom #{.xsession}# in it for the default user that will launch
+/{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a
+server at #{192.168.1.2}#:
code{
@@ -287,22 +289,21 @@ Enjoy.
2~ A base image for a 128M USB key
-*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.
When optimizing an image to fit a certain media size, you need to understand
the tradeoffs you are making between size and functionality. In this
example, we trim only so much as to make room for additional material within
-a 128M media size, but without doing anything to destroy integrity of the
-packages contained within, such as the purging of locale data via the
+a 128M media size, but without doing anything to destroy the integrity of
+the packages contained within, such as the purging of locale data via the
/{localepurge}/ package, or other such "intrusive" optimizations. Of
-particular note, you should not use #{--bootstrap-flavour minimal}# unless
-you really know what you're doing, as omitting priority *{important}*
-packages will most likely produce a broken live system.
+particular note, in order to understand what the #{minimal.chroot}# hook
+does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
}code
@@ -314,23 +315,27 @@ code{
}code
-On the author's system at time of writing, the above configuration produced
-a 78Mbyte image. This compares favourably with the 166Mbyte image produced
-by the default configuration in {Tutorial 1}#tutorial-1.
+On the author's system at the time of writing this, the above configuration
+produced a 95Mbyte image. This compares favourably with the 182Mbyte image
+produced 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-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.
+system. 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. #{--memtest none}# prevents the
+installation of a memory tester. And finally, the execution of the
+#{minimal}# hook removes some unused packages and files.
+
+Using other hooks, like for example the #{stripped.chroot}# hook found in
+#{/usr/share/doc/live-build/examples/hooks}#, may shave off additional small
+amounts of space and produce an image of 76MB. But it is up to you to decide
+if the functionality that is sacrificed with each size optimization is worth
+the loss of functionality.
2~ A localized KDE desktop and installer
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index a79f060..d1e4b47 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -8,87 +8,119 @@ live-build software and the live image itself.
2~ Use auto to manage configuration changes
-Live configurations rarely are perfect on the first try. You'll likely need
-to make a series of revisions until you are satisfied. However,
-inconsistencies can creep into your configuration from one revision to the
-next if you aren't careful. The main problem is, once a variable is given a
-default value, that value will not be recomputed from other variables that
-may change in later revisions.
-
-For example, when the distribution is first set, many 'dependent' variables
-are given default values that suit that distribution. However, if you later
-decide to change the distribution, those dependent variables continue to
-retain old values that are no longer appropriate.
-
-A second, related problem is that if you run #{lb config}# and then upgrade
-to a new version of live-build that has changed one of the variable names,
-you will discover this only by manual review of the variables in your
-#{config/*}# files, which you will then need to use to set the appropriate
-option again.
-
-All of this would be a terrible nuisance if it weren't for auto/* scripts,
-simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
-that are designed to help you manage your configuration. Simply create an
-auto/config script containing #{lb config}# command with all desired
-options, and an auto/clean that removes the files containing configuration
-variable values, and each time you run #{lb config}# and #{lb clean}#, these
-files will be executed. This will ensure that your configuration is kept
-internally consistent from one revision to the next and from one live-build
-release to the next (Although you will still have to take care and read the
-documentation when you upgrade live-build and make adjustments as needed).
-
-2~ Example auto scripts
-
-Use auto script examples such as the following as the starting point for
-your new live-build configuration. Take note that when you call the #{lb}#
-command that the auto script wraps, you must specify #{noauto}# as its
-parameter to ensure that the auto script isn't called again,
-recursively. Also, don't forget to ensure the scripts are executable
-(e.g. #{chmod 755 auto/*}#).
-
-#{auto/config}#
+Live configurations rarely are perfect on the first try. It may be fine to
+pass #{lb config}# options from the command-line to perform a single build,
+but it is more typical to revise those options and build again until you are
+satisfied. To support these changes, you will need auto scripts which ensure
+your configuration is kept in a consistent state.
+
+3~ Why you need auto
+
+The #{lb config}# command stores the options you pass to it in #{config/*}#
+files along with many other options set to default values. If you run #{lb
+config}# again, it will not reset any option that was defaulted based on
+your initial options. So, for example, if you run #{lb config}# again with a
+new value for #{--distribution}#, any dependent options that were defaulted
+for the old distribution may no longer work with the new. Nor are these
+files intended to be read or edited. They store values for over a hundred
+options, so nobody, let alone yourself, will be able to see in these which
+options you actually specified. And finally, if you run #{lb config}#, then
+upgrade live-build and it happens to rename an option, #{config/*}# would
+still contain variables named after the old option that are no longer valid.
+
+For all these reasons, #{auto/*}# scripts will make your life easier. They
+are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}#
+commands that are designed to help you manage your configuration. The
+#{auto/config}# script stores your #{lb config}# command with all desired
+options, the #{auto/clean}# script removes the files containing
+configuration variable values, and the #{auto/build}# script keeps a
+#{build.log}# of each build. Each of these scripts is run automatically
+every time you run the corresponding #{lb}# command. By using these scripts,
+your configuration is easier to read and is kept internally consistent from
+one revision to the next. Also, it will be much easier for you identify and
+fix options which need to change when you upgrade live-build after reading
+the updated documentation.
+
+3~ Use example auto scripts
+
+For your convenience, live-build comes with example auto shell scripts to
+copy and edit. Start a new, default configuration, then copy the examples
+into it:
+
+code{
+
+ $ mkdir mylive && cd mylive && lb config
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
+
+}code
+
+Edit #{auto/config}#, adding any options as you see fit. For instance:
code{
#!/bin/sh
lb config noauto \
- --package-lists "standard" \
+ --architectures i386 \
+ --linux-flavours 686-pae \
+ --binary-images hdd \
+ --mirror-bootstrap http://ftp.es.debian.org/debian/ \
+ --mirror-binary http://ftp.es.debian.org/debian/ \
"${@}"
}code
-#{auto/clean}#
+Now, each time you use #{lb config}#, #{auto/config}# will reset the
+configuration based on these options. When you want to make changes to them,
+edit the options in this file instead of passing them to #{lb config}#. When
+you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files
+along with any other build products. And finally, when you use #{lb build}#,
+a log of the build will be written by #{auto/build}# in #{build.log}#.
+
+Note: A special #{noauto}# parameter is used here to suppress another call
+to #{auto/config}#, thereby preventing infinite recursion. Make sure you
+don't accidentally remove it when making edits. Also, take care to ensure
+when you split the #{lb config}# command across multiple lines for
+readability, as shown in the example above, that you don't forget the
+backslash (\) at the end of each line that continues to the next.
+
+2~ Clone a configuration published via Git
+
+Use the #{lb config --config}# option to clone a Git repository that
+contains a Debian Live configuration. If you would like to base your
+configuration on one maintained by the Debian Live project, look at
+http://live.debian.net/gitweb for the repositories prefixed with
+#{config-}#.
+
+For example, to build a rescue image, use the #{config-rescue}# repository
+as follows:
code{
- #!/bin/sh
- lb clean noauto "${@}"
- rm -f config/binary config/bootstrap \
- config/chroot config/common config/source
- rm -f build.log
+ $ mkdir live-rescue && cd live-rescue
+ $ lb config git://live.debian.net/git/config-rescue.git
}code
-#{auto/build}#
+Edit #{auto/config}# and any other things you need in the #{config}# tree to
+suit your needs.
+
+You may optionally define a shortcut in your Git configuration by adding the
+following to your #{${HOME}/.gitconfig}#:
code{
- #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee build.log
+ [url "git://live.debian.net/git/"]
+ insteadOf = ldn:
}code
-We now ship example auto scripts with live-build based on the examples
-above. You may copy those as your starting point.
+This enables you to use #{ldn:}# anywhere you need to specify the address of
+a #{live.debian.net}# git repository. If you also drop the optional #{.git}#
+suffix, starting a new image using this configuration is as easy as:
code{
- $ cp /usr/share/doc/live-build/examples/auto/* auto/
+ $ lb config ldn:config-rescue
}code
-Edit #{auto/config}#, changing or adding any options as you see fit. In the
-example above, #{--package-lists standard}# is set to the default
-value. Change this to an appropriate value for your image (or delete it if
-you want to use the default) and add any additional options in continuation
-lines that follow.
diff --git a/manual/de/user_overview.ssi b/manual/de/user_overview.ssi
index 04578d4..61c653c 100644
--- a/manual/de/user_overview.ssi
+++ b/manual/de/user_overview.ssi
@@ -58,9 +58,9 @@ subdirectory which it populates with some default settings, and a skeleton
code{
$ lb config
- [2012-03-19 15:17:14] lb_config
+ [2012-08-03 22:59:17] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree for a debian system
+ P: Creating config tree for a debian/i386 system
}code
@@ -69,12 +69,12 @@ 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).
-Normally, you will want to specify some options. For example, to include the
-'gnome' package list in your configuration:
+Normally, you will want to specify some options. For example, to specify
+which distribution you want to build using its codename:
code{
- $ lb config -p gnome
+ $ lb config --distribution sid
}code
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 8ed3e19..bd75d8e 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: 2012-08-02
+ :published: 2012-08-06
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 2cd040b..1f02a62 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -242,7 +242,7 @@ code{
On the author's system at the time of writing this, the above configuration produced a 95Mbyte image. This compares favourably with the 182Mbyte image produced 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-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. 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. #{--memtest none}# prevents the installation of a memory tester. And finally, the execution of the #{minimal}# hook removes some unused packages and files.
+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. 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. #{--memtest none}# prevents the installation of a memory tester. And finally, the execution of the #{minimal}# hook removes some unused packages and files.
Using other hooks, like for example the #{stripped.chroot}# hook found in #{/usr/share/doc/live-build/examples/hooks}#, may shave off additional small amounts of space and produce an image of 76MB. But it is up to you to decide if the functionality that is sacrificed with each size optimization is worth the loss of functionality.
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index 0bfeaf8..80b99ef 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: 02.08.2012
+ :published: 06.08.2012
@publisher: Proyecto Debian Live <debian-live at lists.debian.org>
diff --git a/manual/es/project_bugs.ssi b/manual/es/project_bugs.ssi
index 9b8e859..cde4c17 100644
--- a/manual/es/project_bugs.ssi
+++ b/manual/es/project_bugs.ssi
@@ -2,10 +2,10 @@ B~ Cómo informar acerca de errores.
1~bugs Informes de errores.
-Debian Live está lejos de ser perfecto, pero queremos que sea lo más
-perfecto posible - con tu ayuda. No dudar en informar de un error: es mejor
-llenar un informe dos veces que no hacerlo nunca. Sin embargo, este capítulo
-incluye recomendaciones sobre cómo presentar buenos informes de errores.
+Debian Live is far from being perfect, but we want to make it as close as
+possible to perfect - with your help. Do not hesitate to report a bug. It is
+better to fill a report twice than never. However, this chapter includes
+recommendations on how to file good bug reports.
Para los impacientes:
@@ -23,15 +23,15 @@ del sistema en vivo que se está construyendo.
2~ Problemas conocidos
-Debido a que Debian *{testing}* y Debian *{unstable}* están cambiando
-continuamente, no siempre es posible crear un sistema con éxito cuando se
-especifica cualquiera de estas dos versiones.
+Since Debian *{testing}* and Debian *{unstable}* distributions are moving
+targets, when you specify either of them as the target system distribution,
+a successful build may not always be possible.
% FIXME:
-Si esto causa mucha dificultad, no se debe crear un sistema basado en
-*{testing}* o *{unstable}*, sino que debe utilizarse *{stable}*. live-build
-siempre crea, por defecto, la versión *{stable}* .
+If this causes too much difficulty for you, do not build a system based on
+*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always
+defaults to the *{stable}* release.
Los problemas detectados se especifican en la sección 'status' de la página
web http://live.debian.net/.
@@ -60,10 +60,10 @@ paquete que se incluya en la imagen esté también al día .
2~collect-information Recopilar información
-Se debe proporcionar información suficiente con el informe. Como mínimo, la
-versión exacta de live-build donde se encuentra el error y los pasos para
-reproducirlo. Se debe utilizar el sentido común e incluir cualquier
-información pertinente si se cree que podría ayudar a resolver el problema.
+Please provide enough information with your report. Include, at least, the
+exact version of live-build where the bug is encountered and the steps to
+reproduce it. Please use your common sense and provide any other relevant
+information if you think that it might help in solving the problem.
Para sacar el máximo provecho de un informe de errores, se requerirá al
menos la siguiente información:
@@ -86,10 +86,9 @@ _* Distribución del sistema en vivo.
_* Versión del kernel en el sistema en vivo.
-Se puede generar un log del proceso de creación mediante el comando
-#{tee}#. Se recomienda hacer esto de forma automática con un script
-#{auto/build}#; (ver {Gestionar una configuración}#managing-a-configuration
-para más detalles).
+You can generate a log of the build process by using the #{tee}# command. We
+recommend doing this automatically with an #{auto/build}# script (see
+{Managing a configuration}#managing-a-configuration for details).
code{
@@ -115,39 +114,36 @@ precedidos de #{LC_ALL=C}# o #{LC_ALL=en_US}#.
2~ Aislar el fallo si es posible
-Si es posible, aislar el caso del fallo al menor cambio posible que lo
-produzca. No siempre es fácil hacer esto, así que si no se consigue para el
-informe, no hay que preocuparse. Sin embargo, si se planea el ciclo de
-desarrollo bién, con conjuntos de cambios lo bastante pequeños por
-iteración, puede ser posible aislar el problema mediante la construcción de
-una simple «base» de configuración que se ajuste a la configuración actual
-deseada, más el conjunto del cambio que falla añadido. Si resulta difícil
-determinar que cambios produjeron el error, puede ser que se haya incluido
-demasiado en cada conjunto de cambios y se deba desarrollar en incrementos
-más pequeños.
+If possible, isolate the failing case to the smallest possible change that
+breaks. It is not always easy to do this so if you cannot manage it for your
+report, do not worry. However, if you plan your development cycle well,
+using small enough change sets per iteration, you may be able to isolate the
+problem by constructing a simpler 'base' configuration that closely matches
+your actual configuration plus just the broken change set added to it. If
+you have a hard time sorting out which of your changes broke, it may be that
+you are including too much in each change set and should develop in smaller
+increments.
2~ Utilizar el paquete correcto sobre el que informar del error
-Si no se sabe qué componente es responsable del error o si el error es un
-error general relativo a los sistemas en vivo, se puede rellenar un informe
-de errores contra el pseudo-paquete debian-live.
+If you do not know what component is responsible for the bug or if the bug
+is a general bug concerning live systems, you can fill a bug against the
+debian-live pseudo-package.
-Sin embargo, se agradece si se intenta limitar la búsqueda a donde aparece
-el error.
+However, we would appreciate it if you try to narrow it down according to
+where the bug appears.
3~ En la preinstalación (bootstrap) en tiempo de creación.
-live-build arranca primero un sistema Debian básico con /{debootstrap}/ o
-/{cdebootstrap}/. Puede fallar dependiendo de la herramienta usada en la
-preinstalación y de la distribución Debian empleada. Si un error aparece en
-este momento, se debe comprobar si está relacionado con un paquete
-específico de Debian (es lo más probable), o si está relacionado con la
-herramienta de preinstalación en sí.
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or
+/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
+distribution it is bootstrapping, it may fail. If a bug appears here, check
+if the error is related to a specific Debian package (most likely), or if it
+is related to the bootstrapping tool itself.
-En ambos casos, esto no es un error de Debian Live, sino de Debian en sí
-mismo, por lo cual el equipo de Debian Live no puede solucionarlo
-directamente. Informe del error sobre la herramienta de preinstalación o el
-paquete que falla.
+In both cases, this is not a bug in Debian Live, but rather in Debian itself
+and probably we cannot fix it directly. Please report such a bug against the
+bootstrapping tool or the failing package.
3~ Mientras se instalan paquetes en tiempo de creación.
@@ -161,41 +157,41 @@ debe informar sobre el paquete que falla. Se puede obtener más información
ejecutando /{debootstrap}/ de forma separada del sistema de creación en vivo
o ejecutando #{lb bootstrap --debug}#.
-Además, si se está utilizando una réplica local y/o cualquier tipo de proxy
-y se experimenta un problema, se debe intentar reproducir siempre
-preinstalando desde una réplica oficial.
+Also, if you are using a local mirror and/or any sort of proxy and you are
+experiencing a problem, please always reproduce it first by bootstrapping
+from an official mirror.
3~ En tiempo de arranque
-Si la imagen no arranca, se debería informar la lista de correo, junto con
-la información solicitada en {Recopilar información}#collect-information. No
-hay que olvidar mencionar, cómo y cuando la imagen falla, en Qemu,
-VirtualBox, VMWare o hardware real. Si se está utilizando una tecnología de
-virtualización de cualquier tipo, se debe probar la imagen en hardware real
-antes de informar de un error. Proporcionar una captura de pantalla del
-error también es muy útil.
+If your image does not boot, please report it to the mailing list together
+with the information requested in {Collect
+information}#collect-information. Do not forget to mention, how/when the
+image failed, whether in Qemu, Virtualbox, VMWare or real hardware. If you
+are using a virtualization technology of any kind, please always run it on
+real hardware before reporting a bug. Providing a screenshot of the failure
+is also very helpful.
3~ En tiempo de ejecución
-Si un paquete se ha instalado correctamente, pero falla cuando se ejecuta el
-sistema en vivo, esto es probablemente un error en Debian Live. Sin embargo,
+If a package was successfully installed, but fails while actually running
+the Live system, this is probably a bug in Debian Live. However:
2~ Hacer la investigación
-Antes de presentar el informe de errores, buscar en la web el mensaje de
-error en particular o el síntoma que se está percibiendo. Como es muy poco
-probable que sea la única persona que tiene ese problema en concreto,
-siempre existe la posibilidad de que se haya discutido en otras partes y
-exista una posible solución, parche o se haya propuesto una alternativa.
+Before filing the bug, please search the web for the particular error
+message or symptom you are getting. As it is highly unlikely that you are
+the only person experiencing a particular problem. There is always a chance
+that it has been discussed elsewhere and a possible solution, patch, or
+workaround has been proposed.
Se debe prestar especial atención a la lista de correo de Debian Live, así
como su página principal, ya que seguramente tienen la información más
actualizada. Si esa información existe, se debe incluir la referencia a ella
en su informe de errores.
-Además, se debe comprobar las listas de errores actuales de live-build,
-live-boot, live-config y live-tools y verificar si se ha informado ya de
-algo similar.
+In addition, you should check the current bug lists for live-build,
+live-boot, live-config and live-tools to see whether something similar has
+already been reported.
2~ Dónde informar de los fallos
diff --git a/manual/es/user_customization-contents.ssi b/manual/es/user_customization-contents.ssi
index f596092..54251da 100644
--- a/manual/es/user_customization-contents.ssi
+++ b/manual/es/user_customization-contents.ssi
@@ -14,12 +14,11 @@ de debconf.
2~includes Includes
-Idealmente, un sistema Debain Live debería incluir solamente ficheros que
-son obtenidos de paquetes Debian no modificados. Sin embargo, algunas veces
-es conveniente incluir o modificar algún contenido mediante ficheros. La
-utilización de includes posibilita la inclusión, modificación o cambio de
-cualquier fichero en la imagen Debian Live a crear. live-build tiene tres
-mecanismos:
+While ideally a Debian live system would include files entirely provided by
+unmodified Debian packages, it is sometimes convenient to provide or modify
+some content by means of files. Using includes, it is possible to add (or
+replace) arbitrary files in your Debian Live image. live-build provides two
+mechanisms for using them:
_* Includes locales en chroot : Estos includes permiten incluir o reemplazar
ficheros en el sistema de ficheros chroot. Para más información ver
@@ -29,11 +28,6 @@ _* Includes locales en Binary: Estos includes permiten incluir o reemplazar
ficheros en la propia imagen binaria generada. Para más información ver
{Includes locales en Binary}#binary-local-includes
-_* Includes en Binary: Estos includes permiten incluir o reemplazar ficheros
-específicos de Debian en la imagen binaria, como pueden ser plantillas o
-directorios de herramientas. Para más información ver {Includes en
-Binary}#binary-includes
-
Para más infomación acerca de la diferencia entre las imágenes "Live" y
"binary" ver {Términos}#terms
@@ -104,23 +98,6 @@ code{
Los ficheros aparecerán en el directorio raíz del medio desde el que se
instalará el sistema en vivo.
-3~binary-includes Includes en Binary
-
-live-build tiene algún fichero estandar, como puede ser la documentación,
-que se incluyen por defecto en el medio de instalación. Esto puede ser
-desactivado con:
-
-code{
-
- $ lb config --includes none
-
-}code
-
-Si no se utiliza esta opción, live-build instalará el material en el
-directorio #{/includes/}# del sistema de ficheros del medio de instalación
-por defecto. En lugar de none, se puede especificar un directorio
-alternativo mediante la misma opción #{--includes}#.
-
2~hooks Scripts gancho (Hooks)
Los scripts gancho permiten ejecutar órdenes para personalizar la imagen en
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index c267bce..30c3c17 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -261,7 +261,7 @@ normal («non-live» N.del T.). Tal y como se mencionaba anteriormente, si se
desea usar la misma lista para la etapa «chroot» basta con solamente añadir
el sufijo #{.list}#
-3~ Listas de paquetes generadas
+3~generated-package-lists Generated package lists
A veces ocurre que la mejor manera de crear una lista es generarla con un
script. Cualquier línea que comience con un signo de exclamación indica un
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index 04d0351..80546dc 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -87,8 +87,7 @@ code{
$ mkdir tutorial2
$ cd tutorial2
- $ lb config -p lxde
- $ echo iceweasel >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel" >> config/package-lists/my.list.chroot
}code
@@ -143,7 +142,6 @@ code{
lb config noauto \
--architectures i386 \
--linux-flavours 686-pae \
- --package-lists lxde \
"${@}"
}code
@@ -161,17 +159,16 @@ Completar la lista de paquetes local:
code{
- $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel xchat" >> config/package-lists/my.list.chroot
}code
-En primer lugar con #{--architectures 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-pae}# 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, #{--architectures 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 have chosen the /{lxde}/ task metapackage to
+give us a minimal desktop. And finally, we have added two initial favourite
+packages: /{iceweasel}/ and /{xchat}/.
Ahora, crear la imagen:
@@ -260,24 +257,27 @@ experiencias recogidas de los usuarios de Debian Live.
*{Caso Práctico:}* Crear una imagen con live-build para arrancar directamente un servidor VNC.
-Hacer un directorio de creación y crear una configuración en esqueleto según
-la lista estándar-x11, incluyendo /{gdm3}/, /{metacity}/ y /{xvnc4viewer}/,
-desactivando los paquetes recomendados para conseguir un sistema mínimo:
+Make a build directory and create an skeletal configuration inside it,
+disabling recommends to make a minimal system. And then create two package
+lists: the first one generated with a script provided by live-build named
+#{Packages}# (see {Generated package lists}#generated-package-lists), and
+the second one including /{xorg}/, /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/.
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686-pae -p standard-x11 \
- --apt-recommends false
- $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
+ $ lb config -a i386 -k 686-pae --apt-recommends false
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo "xorg gdm3 metacity xvnc4viewer" > config/package-lists/my.list.chroot
}code
-Crear el directorio #{/etc/skel}# y poner un fichero #{.xsession}#
-personalizado para el usuario que por defecto ejecutará /{metacity}/ e
-iniciará el /{xvncviewer}/, conectándo al puerto #{5901}# de un servidor en
-#{192.168.1.2}#:
+Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a
+custom #{.xsession}# in it for the default user that will launch
+/{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a
+server at #{192.168.1.2}#:
code{
@@ -305,23 +305,21 @@ Disfrutarlo.
2~ Una imagen básica para un pendrive USB de 128M
-*{Caso Práctico:}* Crear una imagen estándar quitando algunos componentes para que quepa en un pendrive USB de 128M dejándo espacio libre para poder usarlo.
+*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.
-Al optimizar una imagen para adaptarla al tamaño de algunos medios de
-almacenamiento, es necesario comprender el equilibrio que se está haciendo
-entre tamaño y funcionalidad. En este ejemplo, se recorta tanto sólo para
-dar cabida a material adicional dentro de un tamaño de 128M, pero sin hacer
-nada para destruir la integridad de los paquetes que contiene, tales como la
-depuración de las variantes locales a través del paquete /{localepurge}/ u
-otro tipo de optimizaciones «intrusivas». Cabe destacar que no se debe usar
-#{--bootstrap-flavour minimal}# a menos de que realmente se sepa lo que se
-está haciendo, ya que al omitir paquetes de prioridad *{importante}* lo más
-probable es que se produzca un sistema roto.
+When optimizing an image to fit a certain media size, you need to understand
+the tradeoffs you are making between size and functionality. In this
+example, we trim only so much as to make room for additional material within
+a 128M media size, but without doing anything to destroy the integrity of
+the packages contained within, such as the purging of locale data via the
+/{localepurge}/ package, or other such "intrusive" optimizations. Of
+particular note, in order to understand what the #{minimal.chroot}# hook
+does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
}code
@@ -333,25 +331,27 @@ code{
}code
-En el sistema del autor, en el momento de escribir esto, la configuración
-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-pae"}#. Dejar fuera los índices de APT con #{--apt-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.
+On the author's system at the time of writing this, the above configuration
+produced a 95Mbyte image. This compares favourably with the 182Mbyte image
+produced 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-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. 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. #{--memtest none}# prevents the
+installation of a memory tester. And finally, the execution of the
+#{minimal}# hook removes some unused packages and files.
+
+Using other hooks, like for example the #{stripped.chroot}# hook found in
+#{/usr/share/doc/live-build/examples/hooks}#, may shave off additional small
+amounts of space and produce an image of 76MB. But it is up to you to decide
+if the functionality that is sacrificed with each size optimization is worth
+the loss of functionality.
2~ Un escritorio KDE con variante local e instalador
diff --git a/manual/es/user_managing_a_configuration.ssi b/manual/es/user_managing_a_configuration.ssi
index 910524d..8370621 100644
--- a/manual/es/user_managing_a_configuration.ssi
+++ b/manual/es/user_managing_a_configuration.ssi
@@ -9,100 +9,119 @@ dicha.
2~ Utilización de auto para gestionar los cambios de la configuración
-La configuración necesaria para crear un sistema en vivo rara vez es
-perfecta a la primera. Lo normal es que se necesite realizar una serie de
-revisiones hasta que se obtenga algo satisfactorio. Sin embargo, las
-inconsistencias pueden transmitirse de una revisión de la configuración a
-otra si no se es lo suficientemente cuidadoso. El principal problema es que,
-una vez que una variable de la configuración tiene un valor asignado, este
-valor no es recalculado en revisiones posteriores de la configuración. Esto
-hace que, si una variable depende del valor de otra y esta segunda cambia de
-valor, el valor actual de la primera no se ve alterado, debido a que ya
-tenía el valor asignado de antemano.
-
-Por ejemplo, la primera vez que se asigna la distribución a utilizar, se
-asigna a muchas variables un valor por defecto para adecuarse a la
-distribución seleccionada. Sin embargo, si posteriormente se decide
-modificar la distribución, estas variables dependientes continuan reteniendo
-los valores antiguos que, por supuesto, no son los adecuados para la nueva
-distribución.
-
-Otro problema es que la ejecución de la orden #{lb config}# no se
-reejecutará correctamente si se realiza una actualización a una nueva
-versión de las herramientas live-build que modifique el nombre de alguna
-variable de configuración. Además solamente podrá ser descubierto mediante
-una revisión manual de los ficheros del directorio #{config/*}# que se
-deberán modificar para asignar las variables de configuración a un nuevo
-valor apropiado.
-
-Todo esto sería un terrible embrollo si no fuese por los scripts auto/*
-simples envoltorios para los comandos #{lb config}#, #{lb build}# y #{lb
-clean}# que están diseñados para ayudar a la gestión de la
-configuración. Simplemente se debe crear un script llamado auto/config que
-contenga el comando #{lb config}# con todas las opciones que se deseen y
-otro script llamado auto/clean que elimine los ficheros que contienen los
-valores de las variables de configuración. Estos scripts se ejecutarán cada
-vez que se ejecuten los comandos #{lb config}# o #{lb clean}# de manera
-automática. Esto asegurará que la configuración se mantendrá consistente
-desde una versión a otra y desde una versión de las herramientas live-build
-a otra. (Aunque esto no elimina la necesidad de leer la documentación cuando
-se instale una nueva version de las herramientas live-build y quizás
-realizar algún ajuste manual en los ficheros de configuración).
-
-2~ Un ejemplo de scripts auto.
-
-Se debe utilizar scripts auto similares a los ejemplos que se muestran a
-continuación como punto de partida para una nueva configuración de la
-herramienta live-build. Hay que hacer notar que, cuando se ejecuta el
-comando #{lb}# dentro del script auto, se debe especificar la opción
-#{noauto}# para asegurar que el script auto no se vuelve a ejecutar
-repetitivamente. Tampoco se debe olvidar asegurarse de que los scripts auto
-sean ejecutables (por ejemplo #{chmod 755 auto/*}#).
-
-#{auto/config}#
+Live configurations rarely are perfect on the first try. It may be fine to
+pass #{lb config}# options from the command-line to perform a single build,
+but it is more typical to revise those options and build again until you are
+satisfied. To support these changes, you will need auto scripts which ensure
+your configuration is kept in a consistent state.
+
+3~ Why you need auto
+
+The #{lb config}# command stores the options you pass to it in #{config/*}#
+files along with many other options set to default values. If you run #{lb
+config}# again, it will not reset any option that was defaulted based on
+your initial options. So, for example, if you run #{lb config}# again with a
+new value for #{--distribution}#, any dependent options that were defaulted
+for the old distribution may no longer work with the new. Nor are these
+files intended to be read or edited. They store values for over a hundred
+options, so nobody, let alone yourself, will be able to see in these which
+options you actually specified. And finally, if you run #{lb config}#, then
+upgrade live-build and it happens to rename an option, #{config/*}# would
+still contain variables named after the old option that are no longer valid.
+
+For all these reasons, #{auto/*}# scripts will make your life easier. They
+are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}#
+commands that are designed to help you manage your configuration. The
+#{auto/config}# script stores your #{lb config}# command with all desired
+options, the #{auto/clean}# script removes the files containing
+configuration variable values, and the #{auto/build}# script keeps a
+#{build.log}# of each build. Each of these scripts is run automatically
+every time you run the corresponding #{lb}# command. By using these scripts,
+your configuration is easier to read and is kept internally consistent from
+one revision to the next. Also, it will be much easier for you identify and
+fix options which need to change when you upgrade live-build after reading
+the updated documentation.
+
+3~ Use example auto scripts
+
+For your convenience, live-build comes with example auto shell scripts to
+copy and edit. Start a new, default configuration, then copy the examples
+into it:
+
+code{
+
+ $ mkdir mylive && cd mylive && lb config
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
+
+}code
+
+Edit #{auto/config}#, adding any options as you see fit. For instance:
code{
#!/bin/sh
lb config noauto \
- --package-lists "standard" \
+ --architectures i386 \
+ --linux-flavours 686-pae \
+ --binary-images hdd \
+ --mirror-bootstrap http://ftp.es.debian.org/debian/ \
+ --mirror-binary http://ftp.es.debian.org/debian/ \
"${@}"
}code
-#{auto/clean}#
+Now, each time you use #{lb config}#, #{auto/config}# will reset the
+configuration based on these options. When you want to make changes to them,
+edit the options in this file instead of passing them to #{lb config}#. When
+you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files
+along with any other build products. And finally, when you use #{lb build}#,
+a log of the build will be written by #{auto/build}# in #{build.log}#.
+
+Note: A special #{noauto}# parameter is used here to suppress another call
+to #{auto/config}#, thereby preventing infinite recursion. Make sure you
+don't accidentally remove it when making edits. Also, take care to ensure
+when you split the #{lb config}# command across multiple lines for
+readability, as shown in the example above, that you don't forget the
+backslash (\) at the end of each line that continues to the next.
+
+2~ Clone a configuration published via Git
+
+Use the #{lb config --config}# option to clone a Git repository that
+contains a Debian Live configuration. If you would like to base your
+configuration on one maintained by the Debian Live project, look at
+http://live.debian.net/gitweb for the repositories prefixed with
+#{config-}#.
+
+For example, to build a rescue image, use the #{config-rescue}# repository
+as follows:
code{
- #!/bin/sh
- lb clean noauto "${@}"
- rm -f config/binary config/bootstrap \
- config/chroot config/common config/source
- rm -f build.log
+ $ mkdir live-rescue && cd live-rescue
+ $ lb config git://live.debian.net/git/config-rescue.git
}code
-#{auto/build}#
+Edit #{auto/config}# and any other things you need in the #{config}# tree to
+suit your needs.
+
+You may optionally define a shortcut in your Git configuration by adding the
+following to your #{${HOME}/.gitconfig}#:
code{
- #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee build.log
+ [url "git://live.debian.net/git/"]
+ insteadOf = ldn:
}code
-Estos scripts auto vienen de serie con las herramientas live-build. Bastaría
-con copiar estos scripts como punto de partida.
+This enables you to use #{ldn:}# anywhere you need to specify the address of
+a #{live.debian.net}# git repository. If you also drop the optional #{.git}#
+suffix, starting a new image using this configuration is as easy as:
code{
- $ cp /usr/share/doc/live-build/examples/auto/* auto/
+ $ lb config ldn:config-rescue
}code
-Se puede editar el script #{auto/config}#, modificándolo o añadiendo
-cualquier opción que se acomode a las necesidades requeridas. En el ejemplo
-anterior, se asigna la opción por defecto #{--package-lists standard}#. Se
-puede cambiar este valor por uno adecuado o simplemente eliminarlo si no es
-necesario, añadiendo en las líneas siguientes cualquier otra opción que se
-adecue a las necesidades requeridas para la imagen a crear.
diff --git a/manual/es/user_overview.ssi b/manual/es/user_overview.ssi
index ea3c22a..6744381 100644
--- a/manual/es/user_overview.ssi
+++ b/manual/es/user_overview.ssi
@@ -62,9 +62,9 @@ forma de esqueleto #{auto/}#:
code{
$ lb config
- [2012-03-19 15:17:14] lb_config
+ [2012-08-03 22:59:17] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree for a debian system
+ P: Creating config tree for a debian/i386 system
}code
@@ -73,12 +73,12 @@ 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).
-Normalmente, se tendrá que especificar algunas opciones. Por ejemplo, para
-incluir la lista del paquete 'gnome' en la configuración:
+Normally, you will want to specify some options. For example, to specify
+which distribution you want to build using its codename:
code{
- $ lb config -p gnome
+ $ lb config --distribution sid
}code
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 9d4275c..d0e0c82 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: 02.08.2012
+ :published: 06.08.2012
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index f48b7c7..73484a8 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -2,11 +2,10 @@ B~ Rapporter des bogues
1~bugs Rapporter des bogues
-Debian Live est loin d'être parfait, mais nous voulons le rendre aussi
-proche que possible de parfait - avec votre aide. N'hésitez pas à signaler
-un bogue: il est préférable de remplir un rapport deux fois plus que
-jamais. Toutefois, ce chapitre contient des recommandations pour déposer les
-rapports de bogues.
+Debian Live is far from being perfect, but we want to make it as close as
+possible to perfect - with your help. Do not hesitate to report a bug. It is
+better to fill a report twice than never. However, this chapter includes
+recommendations on how to file good bug reports.
Pour les impatients:
@@ -25,15 +24,15 @@ que vous construisez.
2~ Problèmes connus
-Parce que les distributions Debian *{testing}* et Debian *{unstable}* sont
-une cible mouvante, quand vous les spécifiez comme les distributions du
-système cible, une construction avec succès n'est pas toujours possible.
+Since Debian *{testing}* and Debian *{unstable}* distributions are moving
+targets, when you specify either of them as the target system distribution,
+a successful build may not always be possible.
% FIXME:
-Si cela provoque trop de difficulté pour vous, ne pas construire un système
-basé sur *{testing}* or *{unstable}*, mais plutôt utiliser
-*{stable}*. live-build fait toujours défaut à la version *{stable}*.
+If this causes too much difficulty for you, do not build a system based on
+*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always
+defaults to the *{stable}* release.
Les problèmes connus sont énumérés sous la section "status" sur notre page à
http://live.debian.net/.
@@ -61,11 +60,10 @@ dans votre image sont mis à jour aussi.
2~collect-information Recueillir l'information
-S'il vous plaît fournir assez d'informations à votre rapport. Incluez au
-moins la version exacte de live-build où le bogue est rencontré et les
-mesures pour le reproduire. S'il vous plaît utilisez votre bon sens et
-incluez d'autres renseignements pertinents, si vous pensez que cela pourrait
-aider à résoudre le problème.
+Please provide enough information with your report. Include, at least, the
+exact version of live-build where the bug is encountered and the steps to
+reproduce it. Please use your common sense and provide any other relevant
+information if you think that it might help in solving the problem.
Pour tirer le meilleur parti de votre rapport de bogue, nous avons besoin
d'au moins les informations suivantes:
@@ -88,10 +86,9 @@ _* Répartition du système live
_* Version du noyau sur le système live
-Vous pouvez générer un journal du processus de construction en utilisant la
-commande #{tee}#. Nous recommandons de faire cela automatiquement avec un
-script #{auto/build}#; (voir {Gestion d'une
-configuration}#managing-a-configuration pour les détails).
+You can generate a log of the build process by using the #{tee}# command. We
+recommend doing this automatically with an #{auto/build}# script (see
+{Managing a configuration}#managing-a-configuration for details).
code{
@@ -116,37 +113,36 @@ précédées par #{LC_ALL=C}# ou #{LC_ALL=en_US}#.
2~ Isoler le cas qui échoue, si possible
-Si possible, isoler le cas qui échoue au plus petit changement possible. Il
-n'est pas toujours facile de faire cela, donc si vous ne pouvez pas le gérer
-pour votre rapport, ne vous inquiétez pas. Toutefois, si vous planifiez
-votre cycle de développement bien, en utilisant petits ensembles de
-changements par itération, vous pourriez être capable d'isoler le problème
-en construisant une configuration simple «base» qui correspond étroitement à
-la configuration réelle avec seulement le changement cassé ajouté. Si il est
-difficile de trier vos modifications qui cassent, il est possible que vous y
-compris trop dans chaque ensemble de modifications et vous devriez
-developper en petits incréments.
+If possible, isolate the failing case to the smallest possible change that
+breaks. It is not always easy to do this so if you cannot manage it for your
+report, do not worry. However, if you plan your development cycle well,
+using small enough change sets per iteration, you may be able to isolate the
+problem by constructing a simpler 'base' configuration that closely matches
+your actual configuration plus just the broken change set added to it. If
+you have a hard time sorting out which of your changes broke, it may be that
+you are including too much in each change set and should develop in smaller
+increments.
2~ Utilisez le paquet adéquat pour rapporter le bogue
-Si vous ne savez pas quel composant est responsable du bogue ou si le bogue
-est un bogue général concernant les systèmes live, vous pouvez remplir un
-bogue sur le pseudo-paquet debian-live.
+If you do not know what component is responsible for the bug or if the bug
+is a general bug concerning live systems, you can fill a bug against the
+debian-live pseudo-package.
-Toutefois, nous apprécierons si vous essayez de le réduire en fonction de
-l'endroit où le bogue apparaît.
+However, we would appreciate it if you try to narrow it down according to
+where the bug appears.
3~ Au moment de la construction tandis l'amorçage
-live-build amorce d'abord un système Debian de base avec /{debootstrap}/ ou
-/{cdebootstrap}/. Selon l'outil d'amorçage utilisé et de la distribution
-Debian il peut échouer. Si un bogue apparaît ici, vérifiez si l'erreur est
-liée à un paquet Debian spécifique (plus probable), ou si elle est liée à
-l'outil d'amorçage lui-même.
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or
+/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
+distribution it is bootstrapping, it may fail. If a bug appears here, check
+if the error is related to a specific Debian package (most likely), or if it
+is related to the bootstrapping tool itself.
-Dans les deux cas, ce n'est pas un bogue dans Debian Live, mais plutôt dans
-Debian lui-même que nous ne pouvons résoudre directement. S'il vous plaît
-rapportez un bogue sur l'outil d'amorçage ou du paquet défaillant.
+In both cases, this is not a bug in Debian Live, but rather in Debian itself
+and probably we cannot fix it directly. Please report such a bug against the
+bootstrapping tool or the failing package.
3~ Au moment de la construction tandis l'installation de paquets
@@ -161,42 +157,41 @@ défaillant. L'exécution de /{debootstrap}/ séparément du système de
construction ou l'exécution de #{lb bootstrap --debug}# vous donnera plus
d'informations.
-Aussi, si vous utilisez un miroir local et/ou un proxy et vous rencontrez un
-problème, s'il vous plaît toujours le reproduire d'abord bootstrapping sur
-un miroir officiel.
+Also, if you are using a local mirror and/or any sort of proxy and you are
+experiencing a problem, please always reproduce it first by bootstrapping
+from an official mirror.
3~ Au moment du démarrage
-Si votre image ne démarre pas, s'il vous plaît le signaler à la liste de
-diffusion avec les informations demandées dans {Recueillir
-l'information}#collect-information. Ne pas oublier de mentionner,
-comment/quand l'image a échoué, dans Qemu, VirtualBox, VMWare ou matériel
-réel. Si vous utilisez une technologie de virtualisation d'aucune sorte,
-s'il vous plaît toujours tester sur matériel réel avant de rapporter un
-bogue. Fournir une copie d'écran de l'échec est également très utile.
+If your image does not boot, please report it to the mailing list together
+with the information requested in {Collect
+information}#collect-information. Do not forget to mention, how/when the
+image failed, whether in Qemu, Virtualbox, VMWare or real hardware. If you
+are using a virtualization technology of any kind, please always run it on
+real hardware before reporting a bug. Providing a screenshot of the failure
+is also very helpful.
3~ Au moment de l'exécution
-Si un paquet a été installé avec succès, mais échoue tout en exécutant le
-système Live, c'est probablement un bogue dans Debian Live. Cependant,
+If a package was successfully installed, but fails while actually running
+the Live system, this is probably a bug in Debian Live. However:
2~ Faire les recherches
-Avant de présenter le bogue, s'il vous plaît recherchez sur le web le
-message d'erreur ou un symptôme particulier que vous obtenez. Comme il est
-hautement improbable que vous êtes la seule personne qui expérience un
-problème particulier, il y a toujours une chance qu'il a été discuté
-ailleurs, et une solution possible, un correctif, ou une solution de
-contournement a été proposé.
+Before filing the bug, please search the web for the particular error
+message or symptom you are getting. As it is highly unlikely that you are
+the only person experiencing a particular problem. There is always a chance
+that it has been discussed elsewhere and a possible solution, patch, or
+workaround has been proposed.
Vous devez prêter une attention particulière à la liste de diffusion de
Debian Live, ainsi que à la page d'accueil, car elles sont susceptibles de
contenir des informations à jour. Si ces informations existent, toujours
inclure les références au sein de vos rapport de bogues.
-En outre, vous devriez vérifier les listes de bogues en cours de live-build,
-live-boot, live-config et live-tools pour voir si quelque chose de
-semblable n'a été déjà signalée.
+In addition, you should check the current bug lists for live-build,
+live-boot, live-config and live-tools to see whether something similar has
+already been reported.
2~ Où rapporter les bogues
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index f470586..ef43073 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -12,12 +12,11 @@ ils sont installés en fournissant des réponses aux questions debconf.
2~includes Includes
-Bien qu'idéalement un système Debian Live comprendrait des fichiers
-entièrement fournis par les paquets Debian non modifiés, on convient parfois
-de fournir ou de modifier certains contenus par le biais de fichiers. Avec
-les includes, il est possible d'ajouter (ou remplacer) des fichiers
-arbitraires dans votre image live de Debian. live-build prévoit trois
-mécanismes pour leur utilisation:
+While ideally a Debian live system would include files entirely provided by
+unmodified Debian packages, it is sometimes convenient to provide or modify
+some content by means of files. Using includes, it is possible to add (or
+replace) arbitrary files in your Debian Live image. live-build provides two
+mechanisms for using them:
_* Chroot local includes: Ils vous permettent d'ajouter ou remplacer des
fichiers sur le système de fichiers chroot/Live. S'il vous plaît voir
@@ -28,11 +27,6 @@ _* Binary local includes: Ils vous permettent d'ajouter ou de remplacer des
fichiers dans l'image binaire. S'il vous plaît voir {Binary local
includes}#binary-local-includes pour plus d'informations.
-_* Binary includes: Ils vous permettent d'ajouter ou remplacer des fichiers
-spécifiques de Debian dans l'image binaire, comme des modèles et des
-répertoires d'outils. S'il vous plaît voir {Binary includes}#binary-includes
-pour plus d'informations.
-
S'il vous plaît voir {Termes}#terms pour plus d'informations sur la
distinction entre les images "Live" et "binary".
@@ -97,22 +91,6 @@ code{
Ces fichiers apparaissent maintenant dans le répertoire racine du support
live.
-3~binary-includes Binary includes
-
-live-build a certains fichiers standard (comme la documentation) qui seront
-inclus dans la configuration par défaut sur tous les supports live. Ceci
-peut être désactivé avec:
-
-code{
-
- $ lb config --includes none
-
-}code
-
-Sinon, le matériel sera installé par live-build dans #{/includes/}# par
-défaut sur le système de fichiers du support, ou bien vous pouvez spécifier
-un autre chemin d'accès avec #{--includes}#.
-
2~hooks Hooks
Les hooks permettent à les commandes être exécutées dans les étapes de la
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 30c7909..f577d1f 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -254,7 +254,7 @@ une des variantes d'installation non-live. Comme mentionné ci-dessus, si
vous voulez que cette liste soit la même que votre liste pour l'étape
chroot, utilisez simplement le suffixe #{.list}#.
-3~ Listes de paquets générés
+3~generated-package-lists Generated package lists
Il arrive parfois que la meilleure façon de composer une liste est de la
générer avec un script. Toute ligne commençant par un point d'exclamation
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 63ff18f..0d7f8cb 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -87,8 +87,7 @@ code{
$ mkdir tutorial2
$ cd tutorial2
- $ lb config -p lxde
- $ echo iceweasel >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel" >> config/package-lists/my.list.chroot
}code
@@ -143,7 +142,6 @@ code{
lb config noauto \
--architectures i386 \
--linux-flavours 686-pae \
- --package-lists lxde \
"${@}"
}code
@@ -161,18 +159,16 @@ Maintenant remplir votre liste de paquets locaux:
code{
- $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel xchat" >> config/package-lists/my.list.chroot
}code
-Tout d'abord, #{--architectures i386}# assure que sur notre système de
-construction #{amd64}#, nous construisons une version 32 bits qui peut être
-utilisée sur la plupart des machines. En seconde place, nous utilisons
-#{--linux-flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette
-image sur des systèmes beaucoup plus anciens. En troisième lieu, nous avons
-choisi la liste de paquets /{lxde}/ pour nous donner un bureau minimal. Et
-enfin, nous avons ajouté deux premiers paquets préférés: /{iceweasel}/ et
-/{xchat}/.
+First, #{--architectures 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 have chosen the /{lxde}/ task metapackage to
+give us a minimal desktop. And finally, we have added two initial favourite
+packages: /{iceweasel}/ and /{xchat}/.
Maintenant, construire l'image:
@@ -261,24 +257,27 @@ expériences recueillies des utilisateurs de Debian Live.
*{Cas d'utilisation:}* Créer une image avec live-build pour démarrer directement à un serveur VNC.
-Faire un répertoire de construction et créer une arborescence de fichiers
-construite autour de la liste standard x11, avec /{gdm3}/, /{metacity}/ et
-/{xvnc4viewer}/, désactivant «recommends» pour faire un système minimal:
+Make a build directory and create an skeletal configuration inside it,
+disabling recommends to make a minimal system. And then create two package
+lists: the first one generated with a script provided by live-build named
+#{Packages}# (see {Generated package lists}#generated-package-lists), and
+the second one including /{xorg}/, /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/.
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686-pae -p standard-x11 \
- --apt-recommends false
- $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
+ $ lb config -a i386 -k 686-pae --apt-recommends false
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo "xorg gdm3 metacity xvnc4viewer" > config/package-lists/my.list.chroot
}code
-Créez le répertoire #{/etc/skel}# avec une #{.xsession}# personnalisée pour
-l'utilisateur par défaut qui va lancer /{metacity}/ et commencer
-/{xvncviewer}/, en reliant le port #{5901}# sur un serveur à
-#{192.168.1.2}#:
+Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a
+custom #{.xsession}# in it for the default user that will launch
+/{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a
+server at #{192.168.1.2}#:
code{
@@ -306,23 +305,21 @@ Amusez-vous bien!
2~ Une image de base pour une clé USB de 128M
-*{Cas d'utilisation:}* Créer une image standard avec certains composants éliminés afin de l'adapter sur une clé USB de 128M avec espace laissé pour l'utiliser à votre convenance.
+*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.
-Pour l'optimisation d'une image adaptée à la dimension des certains
-supports, vous avez besoin de comprendre le compromis que vous faites entre
-la taille et la fonctionnalité. Dans cet exemple, nous réduisons la taille
-uniquement que pour faire place au matériel supplémentaire au sein d'une
-taille de 128M, mais sans faire rien pour détruire l'intégrité des paquets
-contenus, telle que la purge des données de localisation via le paquet
-/{localepurge}/, ou d'autres optimisations "intrusives". On notera en
-particulier que vous ne devriez pas utiliser #{--bootstrap-flavour minimal}#
-sauf si vous savez vraiment ce que vous faites et que l'omission des paquets
-de priorité *{importante}* produira probablement un système live cassé.
+When optimizing an image to fit a certain media size, you need to understand
+the tradeoffs you are making between size and functionality. In this
+example, we trim only so much as to make room for additional material within
+a 128M media size, but without doing anything to destroy the integrity of
+the packages contained within, such as the purging of locale data via the
+/{localepurge}/ package, or other such "intrusive" optimizations. Of
+particular note, in order to understand what the #{minimal.chroot}# hook
+does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
}code
@@ -334,26 +331,27 @@ code{
}code
-Sur le système de l'auteur au moment de l'écriture, la configuration
-ci-dessus produisait 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-pae"}#. Laissant hors «APT's indices» avec #{--apt-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
-avec #{--apt-recommends false}# économise d'espace supplémentaire, au
-détriment d'omettre certains paquets que vous pourriez autrement attendre à
-être là, tel que /{firmware-linux-free}/ qui peuvent être nécessaires pour
-soutenir certains supports matériels. Les options restantes économisent
-petites quantités d'espace supplémentaire. C'est à vous de décider si la
-fonctionnalité qui est sacrifiée avec chaque optimisation est en vaut la
-perte de fonctionnalité.
+On the author's system at the time of writing this, the above configuration
+produced a 95Mbyte image. This compares favourably with the 182Mbyte image
+produced 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-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. 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. #{--memtest none}# prevents the
+installation of a memory tester. And finally, the execution of the
+#{minimal}# hook removes some unused packages and files.
+
+Using other hooks, like for example the #{stripped.chroot}# hook found in
+#{/usr/share/doc/live-build/examples/hooks}#, may shave off additional small
+amounts of space and produce an image of 76MB. But it is up to you to decide
+if the functionality that is sacrificed with each size optimization is worth
+the loss of functionality.
2~ Un bureau KDE localisé et installateur
diff --git a/manual/fr/user_managing_a_configuration.ssi b/manual/fr/user_managing_a_configuration.ssi
index 05715b1..e054ae4 100644
--- a/manual/fr/user_managing_a_configuration.ssi
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -8,92 +8,119 @@ versions successives du logiciel live-build et de l'image live elle-même.
2~ Utiliser auto pour gérer les modifications de configuration
-Les configurations live sont rarement parfaites du premier coup. Vous aurez
-probablement besoin de faire une série de révisions jusqu'à ce que vous êtes
-satisfait. Cependant, des incohérences peuvent se glisser dans votre
-configuration d'une révision à la prochaine si vous ne faites pas
-attention. Le principal problème est, une fois qu'une variable est donnée
-une valeur par défaut, cette valeur ne sera pas recalculée à partir d'autres
-variables qui peuvent changer dans les révisions ultérieures.
-
-Par exemple, lorsque la distribution est d'abord définie, nombreuses
-variables sont assignées des valeurs par défaut qui conviennent à cette
-distribution. Cependant, si vous décidez ultérieurement de modifier la
-distribution, ces variables dépendantes conservent les anciennes valeurs qui
-ne sont plus appropriées.
-
-Un deuxième problème lié est que si vous exécutez #{lb config}# et ensuite
-mettez à jour une nouvelle version de live-build qui a changée l'un des noms
-des variables, vous découvrirez ce que par un examen manuel des variables
-dans votre fichiers dans #{config/*}#, que vous devrez ensuite utiliser pour
-définir l'option appropriée à nouveau.
-
-Tout cela serait une nuisance terrible si ce n'était pas pour les scripts
-auto/*, simples emballages pour les commandes #{lb config}#, #{lb build}# et
-#{lb clean}# qui sont conçus pour vous aider à gérer votre configuration. Il
-suffit de créer un script auto/config contenant la commande #{lb config}#
-avec toutes les options désirées, et un auto/clean qui supprime les fichiers
-contenant les valeurs des variables de configuration, et chaque fois que
-vous lancez #{lb config}# et #{lb clean}#, ces fichiers seront
-exécutés. Cela permettra d'assurer que votre configuration a une cohérence
-interne d'une révision à l'autre et d'une version de live-build à la
-suivante (bien que vous aurez encore de prendre soin et lire la
-documentation lorsque vous mettez live-build à niveau pour faire les
-ajustements nécessaires).
-
-2~ Exemples de scripts auto
-
-Utiliser des exemples de scripts auto tels que les suivants comme point de
-départ pour votre nouvelle configuration de live-build. Prenez note que
-lorsque vous appelez la commande #{lb}# que votre script auto emballage,
-vous devez spécifier #{noauto}# comme paramètre afin de s'assurer que le
-script automatique n'est pas appelé à nouveau, de façon récursive. Aussi,
-n'oubliez pas de s'assurer que les scripts sont exécutables (par exemple
-#{chmod 755 auto/*}#).
-
-#{auto/config}#
+Live configurations rarely are perfect on the first try. It may be fine to
+pass #{lb config}# options from the command-line to perform a single build,
+but it is more typical to revise those options and build again until you are
+satisfied. To support these changes, you will need auto scripts which ensure
+your configuration is kept in a consistent state.
+
+3~ Why you need auto
+
+The #{lb config}# command stores the options you pass to it in #{config/*}#
+files along with many other options set to default values. If you run #{lb
+config}# again, it will not reset any option that was defaulted based on
+your initial options. So, for example, if you run #{lb config}# again with a
+new value for #{--distribution}#, any dependent options that were defaulted
+for the old distribution may no longer work with the new. Nor are these
+files intended to be read or edited. They store values for over a hundred
+options, so nobody, let alone yourself, will be able to see in these which
+options you actually specified. And finally, if you run #{lb config}#, then
+upgrade live-build and it happens to rename an option, #{config/*}# would
+still contain variables named after the old option that are no longer valid.
+
+For all these reasons, #{auto/*}# scripts will make your life easier. They
+are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}#
+commands that are designed to help you manage your configuration. The
+#{auto/config}# script stores your #{lb config}# command with all desired
+options, the #{auto/clean}# script removes the files containing
+configuration variable values, and the #{auto/build}# script keeps a
+#{build.log}# of each build. Each of these scripts is run automatically
+every time you run the corresponding #{lb}# command. By using these scripts,
+your configuration is easier to read and is kept internally consistent from
+one revision to the next. Also, it will be much easier for you identify and
+fix options which need to change when you upgrade live-build after reading
+the updated documentation.
+
+3~ Use example auto scripts
+
+For your convenience, live-build comes with example auto shell scripts to
+copy and edit. Start a new, default configuration, then copy the examples
+into it:
+
+code{
+
+ $ mkdir mylive && cd mylive && lb config
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
+
+}code
+
+Edit #{auto/config}#, adding any options as you see fit. For instance:
code{
#!/bin/sh
lb config noauto \
- --package-lists "standard" \
+ --architectures i386 \
+ --linux-flavours 686-pae \
+ --binary-images hdd \
+ --mirror-bootstrap http://ftp.es.debian.org/debian/ \
+ --mirror-binary http://ftp.es.debian.org/debian/ \
"${@}"
}code
-#{auto/clean}#
+Now, each time you use #{lb config}#, #{auto/config}# will reset the
+configuration based on these options. When you want to make changes to them,
+edit the options in this file instead of passing them to #{lb config}#. When
+you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files
+along with any other build products. And finally, when you use #{lb build}#,
+a log of the build will be written by #{auto/build}# in #{build.log}#.
+
+Note: A special #{noauto}# parameter is used here to suppress another call
+to #{auto/config}#, thereby preventing infinite recursion. Make sure you
+don't accidentally remove it when making edits. Also, take care to ensure
+when you split the #{lb config}# command across multiple lines for
+readability, as shown in the example above, that you don't forget the
+backslash (\) at the end of each line that continues to the next.
+
+2~ Clone a configuration published via Git
+
+Use the #{lb config --config}# option to clone a Git repository that
+contains a Debian Live configuration. If you would like to base your
+configuration on one maintained by the Debian Live project, look at
+http://live.debian.net/gitweb for the repositories prefixed with
+#{config-}#.
+
+For example, to build a rescue image, use the #{config-rescue}# repository
+as follows:
code{
- #!/bin/sh
- lb clean noauto "${@}"
- rm -f config/binary config/bootstrap \
- config/chroot config/common config/source
- rm -f build.log
+ $ mkdir live-rescue && cd live-rescue
+ $ lb config git://live.debian.net/git/config-rescue.git
}code
-#{auto/build}#
+Edit #{auto/config}# and any other things you need in the #{config}# tree to
+suit your needs.
+
+You may optionally define a shortcut in your Git configuration by adding the
+following to your #{${HOME}/.gitconfig}#:
code{
- #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee build.log
+ [url "git://live.debian.net/git/"]
+ insteadOf = ldn:
}code
-Nous expédions maintenant scripts auto d'exemple avec live-build sur la base
-des exemples ci-dessus. Vous pouvez copier ces comme point de départ.
+This enables you to use #{ldn:}# anywhere you need to specify the address of
+a #{live.debian.net}# git repository. If you also drop the optional #{.git}#
+suffix, starting a new image using this configuration is as easy as:
code{
- $ cp /usr/share/doc/live-build/examples/auto/* auto/
+ $ lb config ldn:config-rescue
}code
-Editer #{auto/config}#, en changeant ou en ajoutant des options comme bon
-vous semble. Dans l'exemple ci-dessus, #{--package-lists standard}# est fixé
-à la valeur par défaut. Changez ce à une valeur appropriée pour votre image
-(ou le supprimer si vous voulez utiliser par défaut) et ajouter des options
-supplémentaires dans les lignes suivantes.
diff --git a/manual/fr/user_overview.ssi b/manual/fr/user_overview.ssi
index b97ae25..c08790e 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -62,9 +62,9 @@ Exécuter #{lb config}# sans aucun argument crée un sous-répertoire
code{
$ lb config
- [2012-03-19 15:17:14] lb_config
+ [2012-08-03 22:59:17] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree for a debian system
+ P: Creating config tree for a debian/i386 system
}code
@@ -74,12 +74,12 @@ 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).
-Normalement, vous voulez spécifier certaines options. Par exemple, pour
-inclure la liste du paquet «gnome» dans votre configuration:
+Normally, you will want to specify some options. For example, to specify
+which distribution you want to build using its codename:
code{
- $ lb config -p gnome
+ $ lb config --distribution sid
}code
diff --git a/manual/it/project_bugs.ssi b/manual/it/project_bugs.ssi
index ea9a6ad..7784fee 100644
--- a/manual/it/project_bugs.ssi
+++ b/manual/it/project_bugs.ssi
@@ -2,10 +2,10 @@ B~ Segnalare bug
1~bugs Segnalare bug
-Debian Live è lungi dall'essere perfetta, ma con il vostro aiuto vogliamo
-avvicinarci il più possibile a questo livello. Non esitare a segnalare un
-bug: è meglio compilare un rapporto due volte che mai. Questo capitolo
-include alcune raccomandazioni su come presentare una buona segnalazione.
+Debian Live is far from being perfect, but we want to make it as close as
+possible to perfect - with your help. Do not hesitate to report a bug. It is
+better to fill a report twice than never. However, this chapter includes
+recommendations on how to file good bug reports.
Per gli impazienti
@@ -22,15 +22,15 @@ live-tools used and the distribution of the live system you are building.
2~ Problemi noti
-Giacché Debian *{testing}* e Debian *{unstable}* subiscono cambiamenti
-continui, quando si specifica l'una o l'altra come sistema di destinazione,
-può non essere sempre possibile una creazione che vada a buon fine.
+Since Debian *{testing}* and Debian *{unstable}* distributions are moving
+targets, when you specify either of them as the target system distribution,
+a successful build may not always be possible.
% FIXME:
-Se questo causa troppe difficoltà, non creare un sistema basato su
-*{testing}* o *{unstable}* ma usare piuttosto *{stable}*. live-build si basa
-su *{stable}* in modo predefinito.
+If this causes too much difficulty for you, do not build a system based on
+*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always
+defaults to the *{stable}* release.
I problemi noti al momento sono elencati sotto la sezione "status" della
nostra pagina iniziale http://live.debian.net/
@@ -58,11 +58,10 @@ sia a sua volta.
2~collect-information Raccogliere informazioni
-Nella segnalazione si invita a fornire informazioni sufficienti. Dovrebbe
-almeno contenere l'esatta versione di live-build nella quale si è trovato il
-bug e i passi per riprodurlo. Con un po' di buon senso si può includere
-qualsiasi altro dettaglio rilevante che si ritiene utile per la risoluzione
-del problema.
+Please provide enough information with your report. Include, at least, the
+exact version of live-build where the bug is encountered and the steps to
+reproduce it. Please use your common sense and provide any other relevant
+information if you think that it might help in solving the problem.
Affinché la segnalazione del bug sia migliore possibile, si richiedono
almeno le seguenti informazioni:
@@ -85,10 +84,9 @@ _* Distribuzione del sistema live
_* Versione del kernel sul sistema live
-È possibile generare un registro del processo di costruzione usando il
-comando #{tee}#. Si raccomanda di farlo automaticamente con uno script
-#{auto/build}#; (si veda {Gestire una
-configurazione}#managing-a-configuration per i dettagli).
+You can generate a log of the build process by using the #{tee}# command. We
+recommend doing this automatically with an #{auto/build}# script (see
+{Managing a configuration}#managing-a-configuration for details).
code{
@@ -112,37 +110,36 @@ della lingua inglese, ad esempio eseguendo il comando live-build preponendo
2~ Se possibile isolare il caso non andato a buon fine
-Se possibile, isolare il caso non andato a buon fine alla variazione più
-piccola che lo causa. Non è sempre facile da fare, perciò non preoccupatevi
-se non riuscite a gestirlo per la vostra segnalazione. Tuttavia, se si
-pianifica bene il ciclo di sviluppo adottando piccole modifiche per ogni
-iterazione, si riuscirà ad isolare il problema creando una configurazione
-semplificata che si avvicina all'attuale con l'aggiunta delle sole modifiche
-problematiche. Se si incontrano serie difficoltà nel trovare la causa,
-potrebbe essere che sono stati inseriti troppi cambiamenti in una sola volta
-e bisogna cambiare approccio.
+If possible, isolate the failing case to the smallest possible change that
+breaks. It is not always easy to do this so if you cannot manage it for your
+report, do not worry. However, if you plan your development cycle well,
+using small enough change sets per iteration, you may be able to isolate the
+problem by constructing a simpler 'base' configuration that closely matches
+your actual configuration plus just the broken change set added to it. If
+you have a hard time sorting out which of your changes broke, it may be that
+you are including too much in each change set and should develop in smaller
+increments.
2~ Segnalare il bug del pacchetto giusto
-If you don't know what component is responsible for the bug or if the bug is
-a general bug concerning live systems, you can fill a bug against the
+If you do not know what component is responsible for the bug or if the bug
+is a general bug concerning live systems, you can fill a bug against the
debian-live pseudo-package.
-However, we would appreciate if you try to narrow it down according to where
-the bug appears.
+However, we would appreciate it if you try to narrow it down according to
+where the bug appears.
3~ Durante la compilazione mentre esegue il bootstrap
-live-build avvia inizialmente un sistema Debian di base con /{debootstrap}/
-o /{cdebootstrap}/; può fallire a seconda dello strumento utilizzato e della
-distribuzione Debian che si sta avviando. Se il bug appare a questo punto
-controllare che l'errore sia relativo ad uno specifico pacchetto Debian (più
-probabile) o allo strumento di avvio stesso.
+live-build first bootstraps a basic Debian system with /{debootstrap}/ or
+/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
+distribution it is bootstrapping, it may fail. If a bug appears here, check
+if the error is related to a specific Debian package (most likely), or if it
+is related to the bootstrapping tool itself.
-In entrambi i casi non è un bug in Debian Live, ma piuttosto in Debian
-stessa che non può essere risolto direttamente. Si prega di inviare una
-segnalazione di bug riguardo l'utilità di avvio o il pacchetto che ha
-fallito.
+In both cases, this is not a bug in Debian Live, but rather in Debian itself
+and probably we cannot fix it directly. Please report such a bug against the
+bootstrapping tool or the failing package.
3~ Durante la compilazione mentre installa i pacchetti
@@ -156,31 +153,32 @@ una segnalazione sul pacchetto che ha fallito. Si otterranno maggiori
informazioni eseguendo /{debootstrap}/ separatamente dal sistema live o
eseguendo #{lb bootstrap --debug}#.
-Se si verifica un problema utilizzando un mirror locale o un qualsiasi tipo
-di proxy è bene riprodurlo avviando da un mirror ufficiale.
+Also, if you are using a local mirror and/or any sort of proxy and you are
+experiencing a problem, please always reproduce it first by bootstrapping
+from an official mirror.
3~ In fase di avvio
-Se l'immagine non si avvia segnalarlo alla mailing list con le informazioni
-richieste in {Raccogliere informazioni}#collect-information. Non dimenticare
-di menzionare come e quando l'immagine fallisce, in Qemu, VMWare o hardware
-reale. Se si utilizza un qualsiasi sistema di virtualizzazione provare
-sempre su hardware reale prima di segnalare un bug; anche fornire
-un'istantanea dello schermo può essere molto utile.
+If your image does not boot, please report it to the mailing list together
+with the information requested in {Collect
+information}#collect-information. Do not forget to mention, how/when the
+image failed, whether in Qemu, Virtualbox, VMWare or real hardware. If you
+are using a virtualization technology of any kind, please always run it on
+real hardware before reporting a bug. Providing a screenshot of the failure
+is also very helpful.
3~ In fase di esecuzione
-Se un pacchetto è stato installato con successo ma fallisce durante
-l'esecuzione del sistema live, si tratta probabilmente di un bug in Debian
-Live. Tuttavia,
+If a package was successfully installed, but fails while actually running
+the Live system, this is probably a bug in Debian Live. However:
2~ Fare la ricerca
-Prima di riportare il bug si prega di cercare sul web il messaggio d'errore
-o il sintomo ottenuti. Poiché è altamente improbabile essere l'unica persona
-ad incontrare un certo problema, c'è sempre la possibilità che sia stato
-discusso altrove e che siano stati proposte una soluzione, una patch o
-soluzione temporanea.
+Before filing the bug, please search the web for the particular error
+message or symptom you are getting. As it is highly unlikely that you are
+the only person experiencing a particular problem. There is always a chance
+that it has been discussed elsewhere and a possible solution, patch, or
+workaround has been proposed.
Si dovrebbe prestare particolare attenzione alla mailing list di Debian Live
così come la pagina iniziale del sito, in quanto contengono informazioni più
@@ -189,7 +187,7 @@ nella segnalazione del bug.
In addition, you should check the current bug lists for live-build,
live-boot, live-config and live-tools to see whether something similar has
-been reported already.
+already been reported.
2~ Dove segnalare i bug
diff --git a/manual/it/user_customization-contents.ssi b/manual/it/user_customization-contents.ssi
index daa333d..4e7ab23 100644
--- a/manual/it/user_customization-contents.ssi
+++ b/manual/it/user_customization-contents.ssi
@@ -11,11 +11,11 @@ vengono installati fornendo risposte alle domande di debconf.
2~includes Include
-Anche se idealmente un sistema live Debian dovrebbe includere file forniti
-interamente dal pacchetti Debian non modificati, a volte è conveniente
-fornire o modificare parte del contenuto per mezzo di file. Utilizzando gli
-include, si può aggiungere (o sostituire) file arbitrari nell'immagine di
-Debian Live. Per usarli, live-build mette a disposizione tre meccanismi:
+While ideally a Debian live system would include files entirely provided by
+unmodified Debian packages, it is sometimes convenient to provide or modify
+some content by means of files. Using includes, it is possible to add (or
+replace) arbitrary files in your Debian Live image. live-build provides two
+mechanisms for using them:
_* Include locali del chroot: permettono di aggiungere o sostituire file al
file system chroot/Live. Vedere {Live/chroot include
@@ -25,10 +25,6 @@ _* Include locali binari: permettono di aggiungere o sostituire file
nell'immagine binaria. Vedere {Include locali binari}#binary-local-includes
per maggiori informazioni
-_* Include binari: permettono di aggiungere o sostituire specifici file
-Debian nell'immagine binaria, come le directory dei template e dei
-tool. Vedere {Include binari}#binary-includes per maggiori informazioni.
-
Si consulti il {Glossario}#terms per ulteriori informazioni sulla
distinzione tra immagini "Live" e "binarie".
@@ -91,22 +87,6 @@ code{
Questi file appariranno nella directory principale del supporto live.
-3~binary-includes Include binari
-
-live-build ha alcuni file standard (come la documentazione) inclusi nella
-configurazione predefinita di ogni supporto live. Ciò può essere
-disabilitato con:
-
-code{
-
- $ lb config --includes none
-
-}code
-
-In caso contrario il materiale verrà installato da live-build nella
-directory #{/includes/}# del filesystem in modo predefinito, oppure è
-possibile specificare un percorso alternativo con #{--includes}#.
-
2~hooks Hook
Gli hook permettono di eseguire comandi nel chroot e nelle fasi binarie
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index 9b46d0d..5455edb 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -243,7 +243,7 @@ installati nel filesystem ma inclusi sul dispositivo live sotto
dell'installatore; come detto sopra, se si vuole che questo sia identico
all'elenco della fase chroot, usare semplicemente il suffisso #{.list}#.
-3~ Generated package lists
+3~generated-package-lists Generated package lists
It sometimes happens that the best way to compose a list is to generate it
with a script. Any line starting with an exclamation point indicates a
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 6c365bd..d8a1a2e 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -83,8 +83,7 @@ code{
$ mkdir tutorial2
$ cd tutorial2
- $ lb config -p lxde
- $ echo iceweasel >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel" >> config/package-lists/my.list.chroot
}code
@@ -139,7 +138,6 @@ code{
lb config noauto \
--architectures i386 \
--linux-flavours 686-pae \
- --package-lists lxde \
"${@}"
}code
@@ -157,17 +155,16 @@ Popolare ora l'elenco locale dei pacchetti:
code{
- $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel xchat" >> config/package-lists/my.list.chroot
}code
-Per prima cosa, #{--architectures 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-pae}# 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, #{--architectures 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 have chosen the /{lxde}/ task metapackage to
+give us a minimal desktop. And finally, we have added two initial favourite
+packages: /{iceweasel}/ and /{xchat}/.
Costruire quindi l'immagine:
@@ -255,25 +252,27 @@ utenti Debian Live.
*{Caso d'uso:}* creazione di un'immagine con live-build per avviare direttamente un server VNC.
-Creare una directory con al suo interno una configurazione scheletrica
-costruita sulla base dell'elenco di standard-x11, tra cui /{gdm3}/,
-/{metacity}/ e /{xvnc4viewer}/, disabilitando i raccomandati per ottenere un
-sistema minimale:
+Make a build directory and create an skeletal configuration inside it,
+disabling recommends to make a minimal system. And then create two package
+lists: the first one generated with a script provided by live-build named
+#{Packages}# (see {Generated package lists}#generated-package-lists), and
+the second one including /{xorg}/, /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/.
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686-pae -p standard-x11 \
- --apt-recommends false
- $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
+ $ lb config -a i386 -k 686-pae --apt-recommends false
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo "xorg gdm3 metacity xvnc4viewer" > config/package-lists/my.list.chroot
}code
-Creare la directory #{/etc/skel}# e inserirvi un #{.xsession}#
-personalizzato per l'utente predefinito che lancerà /{metacity}/ e avvierà
-/{xvncviewer}/, connesso alla porta #{5901}# su un server all'indirizzo
-#{192.168.1.2}#:
+Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a
+custom #{.xsession}# in it for the default user that will launch
+/{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a
+server at #{192.168.1.2}#:
code{
@@ -301,22 +300,21 @@ Buon divertimento.
2~ Un'immagine base per una chiavetta USB da 128M
-*{Caso d'uso:}* creazione di un'immagine standard con alcuni componenti rimossi affinché possa stare su una chiavetta USB da 128M, con lo spazio che rimane da usarsi come meglio si crede.
+*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.
-Quando si cerca di ottimizzare un'immagine affinché sia contenuta in un
-supporto, è necessario capire il compromesso che si deve fare tra la
-dimensione e la funzionalità. In questo esempio, taglieremo solo quanto
-basta per far sì che il tutto stia in 128M, senza fare nient'altro che
-distrugga l'integrità dei pacchetti contenuti, come eliminare localizzazioni
-con il pacchetto /{localepurge}/ o altre ottimizzazioni "intrusive". È da
-notare che non va usato #{--bootstrap-flavour minimal}# a meno che non si
-sappia cosa si sta facendo, come omettere la priorità dei pacchetti
-*{important}* che molto probabilmente produrrà un sistema live danneggiato.
+When optimizing an image to fit a certain media size, you need to understand
+the tradeoffs you are making between size and functionality. In this
+example, we trim only so much as to make room for additional material within
+a 128M media size, but without doing anything to destroy the integrity of
+the packages contained within, such as the purging of locale data via the
+/{localepurge}/ package, or other such "intrusive" optimizations. Of
+particular note, in order to understand what the #{minimal.chroot}# hook
+does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
}code
@@ -328,23 +326,27 @@ code{
}code
-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-pae"}#. Lasciando fuori
-anche gli indici di APT con #{--apt-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.
+On the author's system at the time of writing this, the above configuration
+produced a 95Mbyte image. This compares favourably with the 182Mbyte image
+produced 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-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. 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. #{--memtest none}# prevents the
+installation of a memory tester. And finally, the execution of the
+#{minimal}# hook removes some unused packages and files.
+
+Using other hooks, like for example the #{stripped.chroot}# hook found in
+#{/usr/share/doc/live-build/examples/hooks}#, may shave off additional small
+amounts of space and produce an image of 76MB. But it is up to you to decide
+if the functionality that is sacrificed with each size optimization is worth
+the loss of functionality.
2~ Un desktop KDE localizzato e l'installer
diff --git a/manual/it/user_managing_a_configuration.ssi b/manual/it/user_managing_a_configuration.ssi
index acce0ce..268f574 100644
--- a/manual/it/user_managing_a_configuration.ssi
+++ b/manual/it/user_managing_a_configuration.ssi
@@ -8,88 +8,119 @@ del software live-build che della stessa immagine.
2~ Utilizzare auto per gestire i cambiamenti di configurazione
-Le configurazioni live raramente sono perfette da riuscire al primo colpo,
-servono una serie di revisioni prima di essere soddisfatti. Tuttavia, se non
-si presta attenzione, possono verificarsi delle incoerenze tra una revisione
-e l'altra se non si presta attenzione. Il problema principale è che una
-volta assegnato un valore predefinito ad una variabile, tale valore non sarà
-ricalcolato da altre variabili che possono cambiare in altre revisioni.
-
-Per esempio, durante la prima configurazione della distribuzione, a molte
-variabili 'dipendenti' vengono dati valori predefiniti che si adattino.Per
-cui se in seguito si decide di cambiare distribuzione, quelle variabili
-continueranno a mantenere vecchi valori non più appropriati.
-
-Un secondo problema correlato è l'eseguire #{lb config}# e aggiornare alla
-nuova versione di live-build il quale ha cambiato il nome di una delle
-variabili, lo si può scoprire solamente con una revisione manuale delle
-variabili nei file #{config/*}#, che sarà necessario utilizzare per
-impostare nuovamente le opzioni appropriate.
-
-Tutto ciò potrebbe essere un fastidio terribile se non fosse per gli script
-auto/*, semplici wrapper ai comandi #{lb config}#, #{lb build}# e #{lb
-clean}#, designati per aiutare nella gestione della propria
-configurazione. Basta creare uno script auto/config che contenga il comando
-#{lb config}# con le opzioni desiderate e un auto/clean che rimuove i file
-contenenti valori delle variabili di configurazione, così ogni volta che si
-usano #{lb config}# e #{lb clean}# questi file saranno eseguiti. Ciò fà sì
-che la configurazione sia coerente da una revisione all'altra e tra i
-rilasci delle varie versioni di live-build (sebbene si dovrà comunque fare
-attenzione aggiornando live-build, leggendo la documentazione e facendo le
-modifiche necessarie).
-
-2~ Esempi di script automatici
-
-Usare esempi di script automatici come il seguente come punto di partenza
-per una nuova configurazione di live-build. Si noti che quando si invoca il
-comando #{lb}# incluso nello script, si deve specificare il parametro
-#{noauto}# per essere certi che lo script stesso non venga richiamato
-ricorsivamente. Non dimenticare, inoltre, di accertarsi che gli script siano
-eseguibili (es. #{chmod 755 auto/*}#).
-
-#{auto/config}#
+Live configurations rarely are perfect on the first try. It may be fine to
+pass #{lb config}# options from the command-line to perform a single build,
+but it is more typical to revise those options and build again until you are
+satisfied. To support these changes, you will need auto scripts which ensure
+your configuration is kept in a consistent state.
+
+3~ Why you need auto
+
+The #{lb config}# command stores the options you pass to it in #{config/*}#
+files along with many other options set to default values. If you run #{lb
+config}# again, it will not reset any option that was defaulted based on
+your initial options. So, for example, if you run #{lb config}# again with a
+new value for #{--distribution}#, any dependent options that were defaulted
+for the old distribution may no longer work with the new. Nor are these
+files intended to be read or edited. They store values for over a hundred
+options, so nobody, let alone yourself, will be able to see in these which
+options you actually specified. And finally, if you run #{lb config}#, then
+upgrade live-build and it happens to rename an option, #{config/*}# would
+still contain variables named after the old option that are no longer valid.
+
+For all these reasons, #{auto/*}# scripts will make your life easier. They
+are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}#
+commands that are designed to help you manage your configuration. The
+#{auto/config}# script stores your #{lb config}# command with all desired
+options, the #{auto/clean}# script removes the files containing
+configuration variable values, and the #{auto/build}# script keeps a
+#{build.log}# of each build. Each of these scripts is run automatically
+every time you run the corresponding #{lb}# command. By using these scripts,
+your configuration is easier to read and is kept internally consistent from
+one revision to the next. Also, it will be much easier for you identify and
+fix options which need to change when you upgrade live-build after reading
+the updated documentation.
+
+3~ Use example auto scripts
+
+For your convenience, live-build comes with example auto shell scripts to
+copy and edit. Start a new, default configuration, then copy the examples
+into it:
+
+code{
+
+ $ mkdir mylive && cd mylive && lb config
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
+
+}code
+
+Edit #{auto/config}#, adding any options as you see fit. For instance:
code{
#!/bin/sh
lb config noauto \
- --package-lists "standard" \
+ --architectures i386 \
+ --linux-flavours 686-pae \
+ --binary-images hdd \
+ --mirror-bootstrap http://ftp.es.debian.org/debian/ \
+ --mirror-binary http://ftp.es.debian.org/debian/ \
"${@}"
}code
-#{auto/clean}#
+Now, each time you use #{lb config}#, #{auto/config}# will reset the
+configuration based on these options. When you want to make changes to them,
+edit the options in this file instead of passing them to #{lb config}#. When
+you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files
+along with any other build products. And finally, when you use #{lb build}#,
+a log of the build will be written by #{auto/build}# in #{build.log}#.
+
+Note: A special #{noauto}# parameter is used here to suppress another call
+to #{auto/config}#, thereby preventing infinite recursion. Make sure you
+don't accidentally remove it when making edits. Also, take care to ensure
+when you split the #{lb config}# command across multiple lines for
+readability, as shown in the example above, that you don't forget the
+backslash (\) at the end of each line that continues to the next.
+
+2~ Clone a configuration published via Git
+
+Use the #{lb config --config}# option to clone a Git repository that
+contains a Debian Live configuration. If you would like to base your
+configuration on one maintained by the Debian Live project, look at
+http://live.debian.net/gitweb for the repositories prefixed with
+#{config-}#.
+
+For example, to build a rescue image, use the #{config-rescue}# repository
+as follows:
code{
- #!/bin/sh
- lb clean noauto "${@}"
- rm -f config/binary config/bootstrap \
- config/chroot config/common config/source
- rm -f build.log
+ $ mkdir live-rescue && cd live-rescue
+ $ lb config git://live.debian.net/git/config-rescue.git
}code
-#{auto/build}#
+Edit #{auto/config}# and any other things you need in the #{config}# tree to
+suit your needs.
+
+You may optionally define a shortcut in your Git configuration by adding the
+following to your #{${HOME}/.gitconfig}#:
code{
- #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee build.log
+ [url "git://live.debian.net/git/"]
+ insteadOf = ldn:
}code
-Facciamo un esempio di script automatico per live-build basato sugli esempi
-precedenti; si possono copiare come punto di partenza.
+This enables you to use #{ldn:}# anywhere you need to specify the address of
+a #{live.debian.net}# git repository. If you also drop the optional #{.git}#
+suffix, starting a new image using this configuration is as easy as:
code{
- $ cp /usr/share/doc/live-build/examples/auto/* auto/
+ $ lb config ldn:config-rescue
}code
-Modificare #{auto/config}# aggiungendo o togliendo le opzioni come meglio
-credi. Nel precedente esempio, #{--package-lists standard}# è impostato al
-valore predefinito; cambiarlo in un valore appropriato per l'immagine (o
-cancellarlo se si desidera utilizzare un valore predefinito) e aggiungere
-eventuali opzioni ulteriori in continuazione delle righe che seguono.
diff --git a/manual/it/user_overview.ssi b/manual/it/user_overview.ssi
index c244486..42c2aca 100644
--- a/manual/it/user_overview.ssi
+++ b/manual/it/user_overview.ssi
@@ -61,9 +61,9 @@ sottodirectory in #{auto/}#.
code{
$ lb config
- [2012-03-19 15:17:14] lb_config
+ [2012-08-03 22:59:17] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree for a debian system
+ P: Creating config tree for a debian/i386 system
}code
@@ -72,12 +72,12 @@ 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).
-Normalmente si vorranno specificare delle opzioni, ad esempio per includere
-nella propria configurazione l'elenco del pacchetto "gnome":
+Normally, you will want to specify some options. For example, to specify
+which distribution you want to build using its codename:
code{
- $ lb config -p gnome
+ $ lb config --distribution sid
}code
diff --git a/manual/po/ca/live-manual.ssm.po b/manual/po/ca/live-manual.ssm.po
index 0880b22..9487d60 100644
--- a/manual/po/ca/live-manual.ssm.po
+++ b/manual/po/ca/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-08-02 00:07+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-07-09 14:11+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: debian-live at lists.debian.org\n"
@@ -50,7 +50,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-08-02\n"
+" :published: 2012-08-06\n"
msgstr ""
"@date:\n"
" :published: 2012-07-27\n"
diff --git a/manual/po/ca/project_bugs.ssi.po b/manual/po/ca/project_bugs.ssi.po
index cbe68d4..7080549 100644
--- a/manual/po/ca/project_bugs.ssi.po
+++ b/manual/po/ca/project_bugs.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-04-08 12:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -35,51 +35,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -105,51 +106,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -168,9 +170,9 @@ msgstr ""
#: en/project_bugs.ssi:6
msgid ""
"Debian Live is far from being perfect, but we want to make it as close as "
-"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"possible to perfect - with your help. Do not hesitate to report a bug. It is "
"better to fill a report twice than never. However, this chapter includes "
-"recommendations how to file good bug reports."
+"recommendations on how to file good bug reports."
msgstr ""
#. type: Plain text
@@ -208,9 +210,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
-"moving target, when you specify either as the target system distribution, a "
-"successful build may not always be possible."
+"Since Debian *{testing}* and Debian *{unstable}* distributions are moving "
+"targets, when you specify either of them as the target system distribution, "
+"a successful build may not always be possible."
msgstr ""
#. type: Plain text
@@ -222,8 +224,8 @@ msgstr ""
#: en/project_bugs.ssi:22
msgid ""
"If this causes too much difficulty for you, do not build a system based on *"
-"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
-"always default to the *{stable}* release."
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always "
+"defaults to the *{stable}* release."
msgstr ""
#. type: Plain text
@@ -278,9 +280,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:38
msgid ""
-"Please provide enough information with your report. At least include the "
-"exact version of live-build version where the bug is encountered and steps "
-"to reproduce it. Please use common sense and include other relevant "
+"Please provide enough information with your report. Include, at least, the "
+"exact version of live-build where the bug is encountered and the steps to "
+"reproduce it. Please use your common sense and provide any other relevant "
"information if you think that it might help in solving the problem."
msgstr ""
@@ -341,13 +343,13 @@ msgstr ""
#: en/project_bugs.ssi:60
msgid ""
"You can generate a log of the build process by using the #{tee}# command. We "
-"recommend doing this automatically with an #{auto/build}# script; (see "
+"recommend doing this automatically with an #{auto/build}# script (see "
"{Managing a configuration}#managing-a-configuration for details)."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
@@ -386,9 +388,9 @@ msgstr ""
#: en/project_bugs.ssi:76
msgid ""
"If possible, isolate the failing case to the smallest possible change that "
-"breaks. It is not always easy to do this, so if you can't manage it for your "
-"report, don't worry. However, if you plan your development cycle well, using "
-"small enough change sets per iteration, you may be able to isolate the "
+"breaks. It is not always easy to do this so if you cannot manage it for your "
+"report, do not worry. However, if you plan your development cycle well, "
+"using small enough change sets per iteration, you may be able to isolate the "
"problem by constructing a simpler 'base' configuration that closely matches "
"your actual configuration plus just the broken change set added to it. If "
"you have a hard time sorting out which of your changes broke, it may be that "
@@ -404,16 +406,16 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:80
msgid ""
-"If you don't know what component is responsible for the bug or if the bug is "
-"a general bug concerning live systems, you can fill a bug against the debian-"
-"live pseudo-package."
+"If you do not know what component is responsible for the bug or if the bug "
+"is a general bug concerning live systems, you can fill a bug against the "
+"debian-live pseudo-package."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"However, we would appreciate if you try to narrow it down according to where "
-"the bug appears."
+"However, we would appreciate it if you try to narrow it down according to "
+"where the bug appears."
msgstr ""
#. type: Plain text
@@ -428,14 +430,14 @@ msgid ""
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
-"is related to bootstrapping tool itself."
+"is related to the bootstrapping tool itself."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:88
msgid ""
"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
-"which we can not fix this directly. Please report such a bug against the "
+"and probably we cannot fix it directly. Please report such a bug against the "
"bootstrapping tool or the failing package."
msgstr ""
@@ -465,9 +467,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:96
msgid ""
-"Also, if you are using a local mirror and/or any of sort of proxy and you "
-"are experiencing a problem, please always reproduce it first by "
-"bootstrapping from an official mirror."
+"Also, if you are using a local mirror and/or any sort of proxy and you are "
+"experiencing a problem, please always reproduce it first by bootstrapping "
+"from an official mirror."
msgstr ""
#. type: Plain text
@@ -480,10 +482,10 @@ msgstr ""
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
-"VMWare or real hardware. If you are using a virtualization technology of any "
-"kind, please always run it on real hardware before reporting a bug. "
-"Providing a screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, whether in Qemu, "
+"Virtualbox, VMWare or real hardware. If you are using a virtualization "
+"technology of any kind, please always run it on real hardware before "
+"reporting a bug. Providing a screenshot of the failure is also very helpful."
msgstr ""
#. type: Plain text
@@ -495,7 +497,7 @@ msgstr ""
#: en/project_bugs.ssi:104
msgid ""
"If a package was successfully installed, but fails while actually running "
-"the Live system, this is probably a bug in Debian Live. However,"
+"the Live system, this is probably a bug in Debian Live. However:"
msgstr ""
#. type: Plain text
@@ -508,8 +510,8 @@ msgstr ""
msgid ""
"Before filing the bug, please search the web for the particular error "
"message or symptom you are getting. As it is highly unlikely that you are "
-"the only person experiencing a particular problem, there is always a chance "
-"that it has been discussed elsewhere, and a possible solution, patch, or "
+"the only person experiencing a particular problem. There is always a chance "
+"that it has been discussed elsewhere and a possible solution, patch, or "
"workaround has been proposed."
msgstr ""
@@ -526,8 +528,8 @@ msgstr ""
#: en/project_bugs.ssi:112
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, live-config and live-tools to see whether something similar has been "
-"reported already."
+"boot, live-config and live-tools to see whether something similar has "
+"already been reported."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ca/user_customization-contents.ssi.po b/manual/po/ca/user_customization-contents.ssi.po
index 29326c9..67cd0ee 100644
--- a/manual/po/ca/user_customization-contents.ssi.po
+++ b/manual/po/ca/user_customization-contents.ssi.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
-"PO-Revision-Date: 2012-07-26 14:25+0200\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
+"PO-Revision-Date: 2012-08-06 22:59+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: Catalan <debian-live at lists.debian.org>\n"
"Language: ca\n"
@@ -19,8 +19,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -37,51 +36,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -90,8 +90,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -108,51 +107,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -196,14 +196,14 @@ msgid ""
"While ideally a Debian live system would include files entirely provided by "
"unmodified Debian packages, it is sometimes convenient to provide or modify "
"some content by means of files. Using includes, it is possible to add (or "
-"replace) arbitrary files in your Debian Live image. live-build provides "
-"three mechanisms for using them:"
+"replace) arbitrary files in your Debian Live image. live-build provides two "
+"mechanisms for using them:"
msgstr ""
"Tot i que l'ideal seria un sistema Debian Live que inclogués només fitxers "
"proporcionats per paquets Debian sense modificació, de vegades és convenient "
"proporcionar o modificar part del contingut a través de fitxers. Amb els "
"includes, és possible afegir (o substituir) fitxers arbitraris en la imatge "
-"Debian Live. live-build ofereix tres mecanismes per al seu ús:"
+"Debian Live. live-build ofereix dos mecanismes per al seu ús:"
#. type: Plain text
#: en/user_customization-contents.ssi:12
@@ -230,18 +230,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:16
msgid ""
-"_* Binary includes: These allow you to add or replace Debian specific files "
-"in the binary image, such as the templates and tools directories. Please see "
-"{Binary includes}#binary-includes for more information."
-msgstr ""
-"_* Binary includes: Aquests et permeten afegir o substituir els fitxers "
-"específics de Debian a la imatge binària, com ara les plantilles i "
-"directoris d'eines. Consultar {Binary includes}#binary-includes per a més "
-"informació."
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid ""
"Please see {Terms}#terms for more information about the distinction between "
"the \"Live\" and \"binary\" images."
msgstr ""
@@ -249,12 +237,12 @@ msgstr ""
"imatges \"Live\" and \"binary\"."
#. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:18
msgid "3~live-chroot-local-includes Live/chroot local includes"
msgstr "3~live-chroot-local-includes Live/chroot local includes"
#. type: Plain text
-#: en/user_customization-contents.ssi:22
+#: en/user_customization-contents.ssi:20
msgid ""
"Chroot local includes can be used to add or replace files in the chroot/Live "
"filesystem so that they may be used in the Live system. A typical use is to "
@@ -274,7 +262,7 @@ msgstr ""
"processar-los."
#. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:22
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory #{/}# of the "
@@ -287,7 +275,7 @@ msgstr ""
"el sistema en viu, fer:"
#. type: Plain text
-#: en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:27
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/var/www\n"
@@ -297,12 +285,12 @@ msgstr ""
" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
#. type: Plain text
-#: en/user_customization-contents.ssi:33
+#: en/user_customization-contents.ssi:31
msgid "Your configuration will then have the following layout:"
msgstr "La configuració tindrà llavors l'estructura següent:"
#. type: Plain text
-#: en/user_customization-contents.ssi:44
+#: en/user_customization-contents.ssi:42
#, no-wrap
msgid ""
" -- config\n"
@@ -324,7 +312,7 @@ msgstr ""
" `-- templates\n"
#. type: Plain text
-#: en/user_customization-contents.ssi:48
+#: en/user_customization-contents.ssi:46
msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
@@ -333,12 +321,12 @@ msgstr ""
"de tal manera que es sobreescriuen els fitxers instaŀlats pels paquets."
#. type: Plain text
-#: en/user_customization-contents.ssi:50
+#: en/user_customization-contents.ssi:48
msgid "3~binary-local-includes Binary local includes"
msgstr "3~binary-local-includes Binary local includes"
#. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: en/user_customization-contents.ssi:50
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 "
@@ -358,56 +346,24 @@ msgstr ""
"la següent manera:"
#. type: Plain text
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:54
#, no-wrap
msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr " $ cp ~/video_demo.* config/includes.binary/\n"
#. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:58
msgid "These files will now appear in the root directory of the live media."
msgstr ""
"Aquests fitxers apareixeran ara en el directori arrel dels medis en viu."
#. type: Plain text
-#: en/user_customization-contents.ssi:62
-msgid "3~binary-includes Binary includes"
-msgstr "3~binary-includes Binary includes"
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:64
-msgid ""
-"live-build has some standard files (like documentation) that gets included "
-"in the default configuration on every live media. This can be disabled with:"
-msgstr ""
-"live-build té alguns fitxers estàndard (com ara la documentació) que "
-"s'inclouen en la configuració per defecte de tots els medis en viu. Això es "
-"pot desactivar amb:"
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:68
-#, no-wrap
-msgid " $ lb config --includes none\n"
-msgstr " $ lb config --includes none\n"
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:72
-msgid ""
-"Otherwise, the material will be installed by live-build in #{/includes/}# by "
-"default on the media filesystem, or else you can specify an alternate path "
-"with #{--includes}#."
-msgstr ""
-"En cas contrari, el material serà instaŀlat per live-build a #{/includes/}# "
-"per defecte en el sistema de fitxers dels medis o bé es pot especificar una "
-"ruta alternativa amb l'opció #{--includes}#."
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:74
+#: en/user_customization-contents.ssi:60
msgid "2~hooks Hooks"
msgstr "2~hooks Scripts ganxo (Hooks)"
#. type: Plain text
-#: en/user_customization-contents.ssi:76
+#: en/user_customization-contents.ssi:62
msgid ""
"Hooks allow commands to be performed in the chroot and binary stages of the "
"build in order to customize the image."
@@ -416,12 +372,12 @@ msgstr ""
"chroot i binary per tal de personalitzar la imatge."
#. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:64
msgid "3~live-chroot-local-hooks Live/chroot local hooks"
msgstr "3~live-chroot-local-hooks Live/chroot local hooks"
#. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:66
msgid ""
"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -442,12 +398,12 @@ msgstr ""
"un enllaç simbòlic per utilitzar-los en la configuració pròpia."
#. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:68
msgid "3~boot-time-hooks Boot-time hooks"
msgstr "3~boot-time-hooks Scripts ganxo durant l'arrencada"
#. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:70
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-"
@@ -468,12 +424,12 @@ msgstr ""
"third-party-packages."
#. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:72
msgid "3~ Binary local hooks"
msgstr "3~ Binary local hooks"
#. type: Plain text
-#: en/user_customization-contents.ssi:88
+#: en/user_customization-contents.ssi:74
msgid ""
"To run commands in the binary stage, create a hook script with a #{.binary}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -496,12 +452,12 @@ msgstr ""
"copiar o fer un enllaç simbòlic per utilitzar-los en la configuració pròpia."
#. type: Plain text
-#: en/user_customization-contents.ssi:90
+#: en/user_customization-contents.ssi:76
msgid "2~ Preseeding Debconf questions"
msgstr "2~ Preconfiguració de les preguntes de Debconf"
#. type: Plain text
-#: en/user_customization-contents.ssi:92
+#: en/user_customization-contents.ssi:78
msgid ""
"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
@@ -514,7 +470,7 @@ msgstr ""
"utilitzant #{debconf-set-selections}# durant l'etapa corresponent."
#. type: Plain text
-#: en/user_customization-contents.ssi:93
+#: en/user_customization-contents.ssi:79
msgid ""
"For more information about debconf, please see #{debconf(7)}# in the /"
"{debconf}/ package."
diff --git a/manual/po/ca/user_customization-packages.ssi.po b/manual/po/ca/user_customization-packages.ssi.po
index be15dd9..54075eb 100644
--- a/manual/po/ca/user_customization-packages.ssi.po
+++ b/manual/po/ca/user_customization-packages.ssi.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-08-01 23:16+0300\n"
-"PO-Revision-Date: 2012-08-02 00:07+0100\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
+"PO-Revision-Date: 2012-08-06 23:01+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: ca\n"
@@ -36,9 +36,8 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -66,22 +65,23 @@ msgstr ""
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -107,9 +107,8 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -137,22 +136,23 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -240,7 +240,7 @@ msgstr ""
"construir la distribució *{unstable}*, sid, s'ha d'especificar:"
#. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config --distribution sid\n"
msgstr " $ lb config --distribution sid\n"
@@ -686,8 +686,8 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:138
-msgid "3~ Generated package lists"
-msgstr "3~ Llistes de paquets generades"
+msgid "3~generated-package-lists Generated package lists"
+msgstr "3~package-lists Generar llistes de paquets"
#. type: Plain text
#: en/user_customization-packages.ssi:140
@@ -703,8 +703,8 @@ msgstr ""
"un script. Qualsevol línia que comença amb un signe d'exclamació indica una "
"ordre que s'executarà dins del chroot quan la imatge es construeix. Per "
"exemple, es podria incloure la línia #{! grep-aptavail -n -sPackage -"
-"FPriority standard | sort}# en una llista de paquets per per produir una "
-"llista ordenada de paquets disponibles amb #{Priority: standard}#."
+"FPriority standard | sort}# en una llista de paquets per produir una llista "
+"ordenada de paquets disponibles amb #{Priority: standard}#."
#. type: Plain text
#: en/user_customization-packages.ssi:142
diff --git a/manual/po/ca/user_customization-runtime.ssi.po b/manual/po/ca/user_customization-runtime.ssi.po
index dbb6277..1f83e15 100644
--- a/manual/po/ca/user_customization-runtime.ssi.po
+++ b/manual/po/ca/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-07-27 21:48+0300\n"
-"PO-Revision-Date: 2012-08-02 15:03+0200\n"
+"PO-Revision-Date: 2012-08-06 23:06+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: ca\n"
@@ -334,16 +334,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:55
-#, fuzzy
-#| msgid ""
-#| "Both the console and X keyboard configuration are performed by #{live-"
-#| "config}# using the #{console-setup}# package. To configure them, use the #"
-#| "{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #"
-#| "{keyboard-model}# boot parameters via the #{--bootappend-live}# option. "
-#| "Valid options for these can be found in #{/usr/share/X11/xkb/rules/base."
-#| "lst}#. To find layouts and variants for a given language, try searching "
-#| "for the English name of the language and/or the country where the "
-#| "language is spoken, e.g:"
msgid ""
"Both the console and X keyboard configuration are performed by #{live-config}"
"# using the #{console-setup}# package. To configure them, use the #{keyboard-"
@@ -356,7 +346,7 @@ msgstr ""
"#{live-config}# s'encarrega de la configuració del teclat per X i per la "
"consola utilitzant el paquet #{console-setup}#. Per la seva configuració es "
"por fer servir els paràmetres d'arrencada #{keyboard-layouts}#, #{keyboard-"
-"variant}#, #{keyboard-options}# i #{keyboard-model}# mitjançant l'opció #{--"
+"variants}#, #{keyboard-options}# i #{keyboard-model}# mitjançant l'opció #{--"
"bootappend-live}#. Es poden trobar opcions vàlides per a aquests a #{/usr/"
"share/X11/xkb/rules/base.lst}#. Per trobar distribucions de teclat i "
"variants per a un idioma determinat, s'ha d'intentar cercar el nom en anglès "
@@ -427,30 +417,16 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:87
-#, fuzzy, no-wrap
-#| msgid ""
-#| " $ lb config --bootappend-live \\\n"
-#| " \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:91
-#, fuzzy
-#| msgid ""
-#| "Multiple values may be specified as comma-delimited lists for each of the "
-#| "#{keyboard-*}# options, with the exception of #{keyboard-model}#, which "
-#| "accepts only one value. Please see the #{keyboard(5)}# man page for "
-#| "details and examples of #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# and #"
-#| "{XKBOPTIONS}# variables. If multiple #{keyboard-variant}# values are "
-#| "given, they will be matched one-to-one with #{keyboard-layouts}# values "
-#| "(see #{setxkbmap(1)}# #{-variant}# option). Empty values are allowed; e."
-#| "g. to define two layouts, the default being US QWERTY and the other being "
-#| "US Dvorak, use:"
msgid ""
"Multiple values may be specified as comma-delimited lists for each of the #"
"{keyboard-*}# options, with the exception of #{keyboard-model}#, which "
@@ -466,23 +442,20 @@ msgstr ""
"model}#, que només accepta un valor. Veure la pàgina de manual #{keyboard(5)}"
"# per a més detalls i exemples de les variables #{XKBMODEL}#, #{XKBLAYOUT}#, "
"#{XKBVARIANT}# y #{XKBOPTIONS}#. Si s'especifican diversos valors de #"
-"{keyboard-variant}# es correspondran un a un amb els valors #{keyboard-"
+"{keyboard-variants}# es correspondran un a un amb els valors #{keyboard-"
"layouts}# (veure #{setxkbmap(1)}# opció #{-variant}#). Es poden utilitzar "
"valors buits, per exemple, per definir dos dissenys, el valor predeterminat "
"US QWERTY i l'altre US Dvorak:"
#. type: Plain text
#: en/user_customization-runtime.ssi:96
-#, fuzzy, no-wrap
-#| msgid ""
-#| " $ lb config --bootappend-live \\\n"
-#| " \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
msgstr ""
" $ lb config --bootappend-live \\\n"
-" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:100
diff --git a/manual/po/ca/user_examples.ssi.po b/manual/po/ca/user_examples.ssi.po
index 7c61658..503559b 100644
--- a/manual/po/ca/user_examples.ssi.po
+++ b/manual/po/ca/user_examples.ssi.po
@@ -5,9 +5,9 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
-"PO-Revision-Date: 2012-06-07 08:43+0300\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
+"PO-Revision-Date: 2012-08-06 23:08+0100\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: none\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ":B~ Exemples"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -40,51 +40,52 @@ msgstr ":B~ Exemples"
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -93,7 +94,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -110,77 +111,78 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34 en/user_examples.ssi:109
+#: en/user_basics.ssi:34 en/user_examples.ssi:107
#, no-wrap
msgid " $ lb config\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:127 en/user_examples.ssi:219
+#: en/user_examples.ssi:125 en/user_examples.ssi:217
#, no-wrap
msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:94
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -311,17 +313,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:59
+#: en/user_examples.ssi:58
#, no-wrap
msgid ""
" $ mkdir tutorial2\n"
" $ cd tutorial2\n"
-" $ lb config -p lxde\n"
-" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-lxde-desktop iceweasel\" >> config/package-lists/my.list.chroot\n"
msgstr ""
+" $ mkdir tutorial2\n"
+" $ cd tutorial2\n"
+" $ echo \"task-lxde-desktop iceweasel\" >> config/package-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:63
+#: en/user_examples.ssi:62
msgid ""
"Our choice of LXDE for this example reflects our desire to provide a minimal "
"desktop environment, since the focus of the image is the single use we have "
@@ -332,30 +336,30 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:65
+#: en/user_examples.ssi:64
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:73
+#: en/user_examples.ssi:72
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:75
+#: en/user_examples.ssi:74
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:76
#, no-wrap
msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:78
msgid ""
"Since we will be changing our personalized image over a number of revisions, "
"and we want to track those changes, trying things experimentally and "
@@ -366,12 +370,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:80
msgid "3~ First revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:86
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -380,64 +384,63 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:91
+#: en/user_examples.ssi:90
msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:101
+#: en/user_examples.ssi:99
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
-" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:105
+#: en/user_examples.ssi:103
msgid ""
"Perform #{lb config}# to generate the config tree, using the #{auto/config}# "
"script you just created:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:111
msgid "Now populate your local package list:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:117
+#: en/user_examples.ssi:115
#, no-wrap
-msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
-msgstr ""
+msgid " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgstr " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:119
msgid ""
"First, #{--architectures 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 "
+"much older systems. Third, we have chosen the /{lxde}/ task metapackage to "
+"give us a minimal desktop. And finally, we have added two initial favourite "
"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:121
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:129
msgid ""
"Note that unlike in the first two tutorials, we no longer have to type #"
"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:131
msgid ""
"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
"satisfied it works, it's time to initialize our #{git}# repository, adding "
@@ -445,7 +448,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:139
+#: en/user_examples.ssi:137
#, no-wrap
msgid ""
" $ git init\n"
@@ -454,19 +457,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:141
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:145
+#: en/user_examples.ssi:143
msgid ""
"In this revision, we're going to clean up from the first build, add the /"
"{vlc}/ package to our configuration, rebuild, test and commit."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:145
msgid ""
"The #{lb clean}# command will clean up all generated files from the previous "
"build except for the cache, which saves having to re-download packages. This "
@@ -475,47 +478,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:151
+#: en/user_examples.ssi:149
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:153
msgid ""
"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:157
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:161
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:165
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:169
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:173
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:179
+#: en/user_examples.ssi:177
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -526,7 +529,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:181
+#: en/user_examples.ssi:179
msgid ""
"We've come to the end of our tutorial series. While many more kinds of "
"customization are possible, even just using the few features explored in "
@@ -536,45 +539,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:183
+#: en/user_examples.ssi:181
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:185
+#: en/user_examples.ssi:183
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:185
msgid ""
-"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
-"{xvnc4viewer}/, disabling recommends to make a minimal system:"
+"Make a build directory and create an skeletal configuration inside it, "
+"disabling recommends to make a minimal system. And then create two package "
+"lists: the first one generated with a script provided by live-build named #"
+"{Packages}# (see {Generated package lists}#generated-package-lists), and the "
+"second one including /{xorg}/, /{gdm3}/, /{metacity}/ and /{xvnc4viewer}/."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:195
+#: en/user_examples.ssi:193
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\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"
+" $ lb config -a i386 -k 686-pae --apt-recommends false\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo \"xorg gdm3 metacity xvnc4viewer\" > config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
+#: en/user_examples.ssi:197
msgid ""
-"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
-"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
+"Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a "
+"custom #{.xsession}# in it for the default user that will launch /"
+"{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a "
+"server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -583,7 +589,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:206
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -591,7 +597,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:209
#, no-wrap
msgid ""
" exit\n"
@@ -599,77 +605,84 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:213
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:221
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:223
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:225
#, no-wrap
-msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:227
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
-"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the /"
+"a 128M media size, but without doing anything to destroy the integrity of "
+"the packages contained within, such as the purging of locale data via the /"
"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
-"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority *{important}* "
-"packages will most likely produce a broken live system."
+"particular note, in order to understand what the #{minimal.chroot}# hook "
+"does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:232
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --apt-indices false \\\n"
-" --memtest none --apt-recommends false --includes none\n"
+" $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none\n"
+" $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:236
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:244
msgid ""
-"On the author's system at time of writing, the above configuration produced "
-"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
-"by the default configuration in {Tutorial 1}#tutorial-1."
+"On the author's system at the time of writing this, the above configuration "
+"produced a 95Mbyte image. This compares favourably with the 182Mbyte image "
+"produced by the default configuration in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:246
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-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."
+"system. 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. #{--memtest none}# prevents the "
+"installation of a memory tester. And finally, the execution of the #{minimal}"
+"# hook removes some unused packages and files."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:248
+msgid ""
+"Using other hooks, like for example the #{stripped.chroot}# hook found in #{/"
+"usr/share/doc/live-build/examples/hooks}#, may shave off additional small "
+"amounts of space and produce an image of 76MB. But it is up to you to decide "
+"if the functionality that is sacrificed with each size optimization is worth "
+"the loss of functionality."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ca/user_managing_a_configuration.ssi.po b/manual/po/ca/user_managing_a_configuration.ssi.po
index 64d7eb2..96a9bf6 100644
--- a/manual/po/ca/user_managing_a_configuration.ssi.po
+++ b/manual/po/ca/user_managing_a_configuration.ssi.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
-"PO-Revision-Date: 2012-07-08 18:02+0200\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
+"PO-Revision-Date: 2012-08-06 23:37+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: ca\n"
@@ -19,7 +19,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -36,51 +36,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -89,7 +90,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -106,51 +107,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -184,168 +186,204 @@ msgstr "2~ Utilitzar auto per gestionar canvis de configuració"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
msgid ""
-"Live configurations rarely are perfect on the first try. You'll likely need "
-"to make a series of revisions until you are satisfied. However, "
-"inconsistencies can creep into your configuration from one revision to the "
-"next if you aren't careful. The main problem is, once a variable is given a "
-"default value, that value will not be recomputed from other variables that "
-"may change in later revisions."
+"Live configurations rarely are perfect on the first try. It may be fine to "
+"pass #{lb config}# options from the command-line to perform a single build, "
+"but it is more typical to revise those options and build again until you are "
+"satisfied. To support these changes, you will need auto scripts which ensure "
+"your configuration is kept in a consistent state."
msgstr ""
-"Les configuracions dels sistemes vius poques vegades són perfectes al primer "
-"intent. És probable que s'hagi de fer una sèrie de revisions fins quedar "
-"satisfet. No obstant això, es poden introduir inconsistències a la "
-"configuració d'una versió a la següent si no se'n te cura. El principal "
-"problema és, que una vegada que a una variable se li assigna un valor per "
-"defecte, aquest valor no es torna a calcular a partir d'altres variables que "
-"poden canviar en revisions posteriors."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
-msgid ""
-"For example, when the distribution is first set, many 'dependent' variables "
-"are given default values that suit that distribution. However, if you later "
-"decide to change the distribution, those dependent variables continue to "
-"retain old values that are no longer appropriate."
+msgid "3~ Why you need auto"
msgstr ""
-"Per exemple, quan la distribució s'estableix per primer cop, a moltes de les "
-"variables dependents se'ls assigna uns valors per defecte que s'adapten a "
-"aquesta distribució. No obstant això, si més endavant es decideix canviar la "
-"distribució, les variables dependents seguiran conservant els mateixos "
-"valors que ja no són apropiats."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:14
msgid ""
-"A second, related problem is that if you run #{lb config}# and then upgrade "
-"to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your #"
-"{config/*}# files, which you will then need to use to set the appropriate "
-"option again."
+"The #{lb config}# command stores the options you pass to it in #{config/*}# "
+"files along with many other options set to default values. If you run #{lb "
+"config}# again, it will not reset any option that was defaulted based on "
+"your initial options. So, for example, if you run #{lb config}# again with a "
+"new value for #{--distribution}#, any dependent options that were defaulted "
+"for the old distribution may no longer work with the new. Nor are these "
+"files intended to be read or edited. They store values for over a hundred "
+"options, so nobody, let alone yourself, will be able to see in these which "
+"options you actually specified. And finally, if you run #{lb config}#, then "
+"upgrade live-build and it happens to rename an option, #{config/*}# would "
+"still contain variables named after the old option that are no longer valid."
msgstr ""
-"Un segon problema relacionat és que si s'executa #{lb config}# i després "
-"s'actualitza a una versió nova de live-build que ha canviat un dels noms de "
-"les variables, només es descobrirà això mitjantçant una revisió manual de "
-"les variables als fitxers de #{config/*}# que després s'hauran de tornar a "
-"modificar per establir l'opció corresponent de nou."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:16
msgid ""
-"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
-"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
-"that are designed to help you manage your configuration. Simply create an "
-"auto/config script containing #{lb config}# command with all desired "
-"options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
-"files will be executed. This will ensure that your configuration is kept "
-"internally consistent from one revision to the next and from one live-build "
-"release to the next (Although you will still have to take care and read the "
-"documentation when you upgrade live-build and make adjustments as needed)."
+"For all these reasons, #{auto/*}# scripts will make your life easier. They "
+"are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# "
+"commands that are designed to help you manage your configuration. The #{auto/"
+"config}# script stores your #{lb config}# command with all desired options, "
+"the #{auto/clean}# script removes the files containing configuration "
+"variable values, and the #{auto/build}# script keeps a #{build.log}# of each "
+"build. Each of these scripts is run automatically every time you run the "
+"corresponding #{lb}# command. By using these scripts, your configuration is "
+"easier to read and is kept internally consistent from one revision to the "
+"next. Also, it will be much easier for you identify and fix options which "
+"need to change when you upgrade live-build after reading the updated "
+"documentation."
msgstr ""
-"Tot això seria una molestia terrible si no fos pels scripts auto/*, simples "
-"embolcalls per les ordres #{lb config}#, #{lb build}# i #{lb clean}# "
-"dissenyats per ajudar a gestionar una configuració. Només cal crear un "
-"script auto/config que contingui totes les opcions que es desitgin, i un "
-"auto/clean que elimini els fitxers que continguin diversos valors de "
-"variables de configuració, cada vegada que s'executi #{lb config}# i #{lb "
-"clean}#, aquests fitxers seran executats. Això assegurarà que la "
-"configuració guarda una coherència interna d'una versió a una altra i d'una "
-"versió de live-build a la següent (Tot i que encara s'haurà d'anar amb "
-"compte i llegir la documentació quan s'actualitzi live-build i fer els "
-"ajustos necessaris )."
+" Per totes aquestes raons, els scripts #{auto/*}# ens fan la vida més fàcil. "
+"Són simples embolcalls per les ordres #{lb config}#, #{lb build}# i #{lb "
+"clean}# dissenyats per ajudar a gestionar una configuració. Només cal crear "
+"un script #{auto/config}# que contingui totes les opcions que es desitgin "
+"per a #{lb config}#, i un #{auto/clean}# que elimini els fitxers que "
+"continguin diversos valors de variables de configuració, i el script #{auto/"
+"build}# guarda un #{build.log}# de cada construcció. Cada vegada que "
+"s'executi l'ordre #{lb}# corresponent, aquests fitxers seran executats "
+"automàticament. L'ús d'aquests scripts assegurarà que la configuració sigui "
+"més senzilla de llegir i que guardi una coherència interna d'una reversió a "
+"una altra. A més a més serà més fàcil identificar i solucionar les opcions "
+"que s'han de canviar al actualitzar d'una versió de live-build a la següent "
+"després de llegir la documentació."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
-msgid "2~ Example auto scripts"
-msgstr "2~ Scripts auto d'exemple"
+msgid "3~ Use example auto scripts"
+msgstr "2~ Utilitzar scripts auto d'exemple"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:20
msgid ""
-"Use auto script examples such as the following as the starting point for "
-"your new live-build configuration. Take note that when you call the #{lb}# "
-"command that the auto script wraps, you must specify #{noauto}# as its "
-"parameter to ensure that the auto script isn't called again, recursively. "
-"Also, don't forget to ensure the scripts are executable (e.g. #{chmod 755 "
-"auto/*}#)."
+"For your convenience, live-build comes with example auto shell scripts to "
+"copy and edit. Start a new, default configuration, then copy the examples "
+"into it:"
msgstr ""
-"Es poden utilitzar scripts auto d'exemple com ara els següents com a punt de "
-"partida per crear una nova configuració de live-build. Tenir en compte que "
-"quan s'invoca l'ordre #{lb}# que embolcalla el script auto, s'ha "
-"d'especificar #{noauto}# com a paràmetre per garantir que el script auto no "
-"es torna a executar de forma recursiva. A més, assegurar-se que els scripts "
-"són fitxers executables (e.g. #{chmod 755 auto/*}#)."
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:22
-msgid "#{auto/config}#"
+#: en/user_managing_a_configuration.ssi:25
+#, no-wrap
+msgid ""
+" $ mkdir mylive && cd mylive && lb config\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:29
+msgid "Edit #{auto/config}#, adding any options as you see fit. For instance:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:40
#, no-wrap
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --package-lists \"standard\" \\\n"
+" --architectures i386 \\\n"
+" --linux-flavours 686-pae \\\n"
+" --binary-images hdd \\\n"
+" --mirror-bootstrap http://ftp.es.debian.org/debian/ \\\n"
+" --mirror-binary http://ftp.es.debian.org/debian/ \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:33
-msgid "#{auto/clean}#"
+#: en/user_managing_a_configuration.ssi:44
+msgid ""
+"Now, each time you use #{lb config}#, #{auto/config}# will reset the "
+"configuration based on these options. When you want to make changes to them, "
+"edit the options in this file instead of passing them to #{lb config}#. When "
+"you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files "
+"along with any other build products. And finally, when you use #{lb build}#, "
+"a log of the build will be written by #{auto/build}# in #{build.log}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:41
-#, no-wrap
+#: en/user_managing_a_configuration.ssi:46
msgid ""
-" #!/bin/sh\n"
-" lb clean noauto \"${@}\"\n"
-" rm -f config/binary config/bootstrap \\\n"
-" config/chroot config/common config/source\n"
-" rm -f build.log\n"
+"Note: A special #{noauto}# parameter is used here to suppress another call "
+"to #{auto/config}#, thereby preventing infinite recursion. Make sure you "
+"don't accidentally remove it when making edits. Also, take care to ensure "
+"when you split the #{lb config}# command across multiple lines for "
+"readability, as shown in the example above, that you don't forget the "
+"backslash (\\) at the end of each line that continues to the next."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:45
-msgid "#{auto/build}#"
+#: en/user_managing_a_configuration.ssi:48
+msgid "2~ Clone a configuration published via Git"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-#, no-wrap
msgid ""
-" #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
+"Use the #{lb config --config}# option to clone a Git repository that "
+"contains a Debian Live configuration. If you would like to base your "
+"configuration on one maintained by the Debian Live project, look at http://"
+"live.debian.net/gitweb for the repositories prefixed with #{config-}#."
msgstr ""
+"Utilitzar l'opció #{lb config --config}# opció per clonar un repositori Git "
+"que contingui una configuració de Debian Live. Si es vol basar la "
+"configuració en un repositori mantingut pel projecte Debian Live, mirar els "
+"repositoris amb el prefix #{config-}# a http://live.debian.net/gitweb"
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:52
msgid ""
-"We now ship example auto scripts with live-build based on the examples "
-"above. You may copy those as your starting point."
+"For example, to build a rescue image, use the #{config-rescue}# repository "
+"as follows:"
msgstr ""
-"Ara incloem scripts auto d'exemple amb live-build basats en els exemples "
-"anteriors. Es poden copiar com a punt de partida."
+"Per exemple, per construir una imatge de rescat, utilitzar el repositori #"
+"{config-rescue}# de la manera següent:"
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:58
+#: en/user_managing_a_configuration.ssi:57
#, no-wrap
-msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
+msgid ""
+" $ mkdir live-rescue && cd live-rescue\n"
+" $ lb config git://live.debian.net/git/config-rescue.git\n"
msgstr ""
+" $ mkdir live-rescue && cd live-rescue\n"
+" $ lb config git://live.debian.net/git/config-rescue.git\n"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:61
msgid ""
-"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
-"example above, #{--package-lists standard}# is set to the default value. "
-"Change this to an appropriate value for your image (or delete it if you want "
-"to use the default) and add any additional options in continuation lines "
-"that follow."
+"Edit #{auto/config}# and any other things you need in the #{config}# tree to "
+"suit your needs."
+msgstr ""
+"Editar #{auto/config}# i qualsevol altra cosa necessària dins l'arbre #"
+"{config}# per satisfer les vostres necessitats."
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:63
+msgid ""
+"You may optionally define a shortcut in your Git configuration by adding the "
+"following to your #{${HOME}/.gitconfig}#:"
msgstr ""
-"Editar #{auto/config}#, canviar o afegir qualsevol opció que millor sembli. "
-"En l'exemple anterior s'estableix el valor per defecte, #{--package-lists "
-"standard}#. Canviar això a qualsevol valor vàlid per la pròpia imatge (o "
-"suprimir-ho si es vol utilitzar el valor per defecte) i afegir opcions "
-"addicionals en les línies que segueixen a continuació."
+"Si es desitja, es pot definir una drecera en la configuració de Git, afegint "
+"el següent a #{${HOME}/.gitconfig}#:"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:68
+#, no-wrap
+msgid ""
+" [url \"git://live.debian.net/git/\"]\n"
+" insteadOf = ldn:\n"
+msgstr ""
+" [url \"git://live.debian.net/git/\"]\n"
+" insteadOf = ldn:\n"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:72
+msgid ""
+"This enables you to use #{ldn:}# anywhere you need to specify the address of "
+"a #{live.debian.net}# git repository. If you also drop the optional #{.git}# "
+"suffix, starting a new image using this configuration is as easy as:"
+msgstr ""
+"Això permet utilitzar #{ldn:}# en qualsevol lloc on cal especificar la "
+"direcció d'un repositori git. També es pot omitir el sufix #{.git}#, "
+"començar una nova imatge amb aquesta configuració és tan fàcil com:"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:76
+#, no-wrap
+msgid " $ lb config ldn:config-rescue\n"
+msgstr " $ lb config ldn:config-rescue\n"
diff --git a/manual/po/ca/user_overview.ssi.po b/manual/po/ca/user_overview.ssi.po
index e1dea32..e003e20 100644
--- a/manual/po/ca/user_overview.ssi.po
+++ b/manual/po/ca/user_overview.ssi.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-16 18:50+0300\n"
-"PO-Revision-Date: 2012-06-28 15:12+0200\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
+"PO-Revision-Date: 2012-08-06 23:11+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: Catalan\n"
@@ -19,7 +19,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -36,51 +36,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -89,7 +90,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -106,56 +107,63 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
+msgstr " $ lb config --distribution sid\n"
+
+#. type: Plain text
#: en/user_overview.ssi:2
msgid ":B~ Overview of tools"
msgstr ":B~ Descripció general de les eines"
@@ -316,10 +324,14 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config\n"
-" [2012-03-19 15:17:14] lb_config\n"
+" [2012-08-03 22:59:17] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree for a debian system\n"
+" P: Creating config tree for a debian/i386 system\n"
msgstr ""
+" $ lb config\n"
+" [2012-08-03 22:59:17] lb_config\n"
+" P: Considering defaults defined in /etc/live/build.conf\n"
+" P: Creating config tree for a debian/i386 system\n"
#. type: Plain text
#: en/user_overview.ssi:45
@@ -338,17 +350,11 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:47
msgid ""
-"Normally, you will want to specify some options. For example, to include the "
-"'gnome' package list in your configuration:"
-msgstr ""
-"Normalment, s'haurà d'especificar algunes opcions. Per exemple, per incloure "
-"la llista de paquets 'gnome' en la configuració:"
-
-#. type: Plain text
-#: en/user_overview.ssi:51
-#, no-wrap
-msgid " $ lb config -p gnome\n"
+"Normally, you will want to specify some options. For example, to specify "
+"which distribution you want to build using its codename:"
msgstr ""
+"Normalment, s'haurà d'especificar algunes opcions. Per exemple, per "
+"especificar quina distribució es vol construir mitjançant el seu nom en clau:"
#. type: Plain text
#: en/user_overview.ssi:55
@@ -359,7 +365,7 @@ msgstr "És possible especificar diverses opcions, com ara:"
#: en/user_overview.ssi:59
#, no-wrap
msgid " $ lb config --binary-images net --bootappend-live \"hostname=live-machine username=live-user\" ...\n"
-msgstr ""
+msgstr " $ lb config --binary-images net --bootappend-live \"hostname=live-machine username=live-user\" ...\n"
#. type: Plain text
#: en/user_overview.ssi:63
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 5e3e7fd..a0b6f8b 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-08-02 00:07+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -50,10 +50,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-08-02\n"
+" :published: 2012-08-06\n"
msgstr ""
"@date:\n"
-" :published: 02.08.2012\n"
+" :published: 06.08.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/de/project_bugs.ssi.po b/manual/po/de/project_bugs.ssi.po
index abe8540..8871cd1 100644
--- a/manual/po/de/project_bugs.ssi.po
+++ b/manual/po/de/project_bugs.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -36,51 +36,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -106,51 +107,52 @@ msgstr ""
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -169,9 +171,9 @@ msgstr ""
#: en/project_bugs.ssi:6
msgid ""
"Debian Live is far from being perfect, but we want to make it as close as "
-"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"possible to perfect - with your help. Do not hesitate to report a bug. It is "
"better to fill a report twice than never. However, this chapter includes "
-"recommendations how to file good bug reports."
+"recommendations on how to file good bug reports."
msgstr ""
#. type: Plain text
@@ -209,9 +211,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
-"moving target, when you specify either as the target system distribution, a "
-"successful build may not always be possible."
+"Since Debian *{testing}* and Debian *{unstable}* distributions are moving "
+"targets, when you specify either of them as the target system distribution, "
+"a successful build may not always be possible."
msgstr ""
#. type: Plain text
@@ -223,8 +225,8 @@ msgstr ""
#: en/project_bugs.ssi:22
msgid ""
"If this causes too much difficulty for you, do not build a system based on *"
-"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
-"always default to the *{stable}* release."
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always "
+"defaults to the *{stable}* release."
msgstr ""
#. type: Plain text
@@ -279,9 +281,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:38
msgid ""
-"Please provide enough information with your report. At least include the "
-"exact version of live-build version where the bug is encountered and steps "
-"to reproduce it. Please use common sense and include other relevant "
+"Please provide enough information with your report. Include, at least, the "
+"exact version of live-build where the bug is encountered and the steps to "
+"reproduce it. Please use your common sense and provide any other relevant "
"information if you think that it might help in solving the problem."
msgstr ""
@@ -342,13 +344,13 @@ msgstr ""
#: en/project_bugs.ssi:60
msgid ""
"You can generate a log of the build process by using the #{tee}# command. We "
-"recommend doing this automatically with an #{auto/build}# script; (see "
+"recommend doing this automatically with an #{auto/build}# script (see "
"{Managing a configuration}#managing-a-configuration for details)."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
@@ -387,9 +389,9 @@ msgstr ""
#: en/project_bugs.ssi:76
msgid ""
"If possible, isolate the failing case to the smallest possible change that "
-"breaks. It is not always easy to do this, so if you can't manage it for your "
-"report, don't worry. However, if you plan your development cycle well, using "
-"small enough change sets per iteration, you may be able to isolate the "
+"breaks. It is not always easy to do this so if you cannot manage it for your "
+"report, do not worry. However, if you plan your development cycle well, "
+"using small enough change sets per iteration, you may be able to isolate the "
"problem by constructing a simpler 'base' configuration that closely matches "
"your actual configuration plus just the broken change set added to it. If "
"you have a hard time sorting out which of your changes broke, it may be that "
@@ -405,16 +407,16 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:80
msgid ""
-"If you don't know what component is responsible for the bug or if the bug is "
-"a general bug concerning live systems, you can fill a bug against the debian-"
-"live pseudo-package."
+"If you do not know what component is responsible for the bug or if the bug "
+"is a general bug concerning live systems, you can fill a bug against the "
+"debian-live pseudo-package."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"However, we would appreciate if you try to narrow it down according to where "
-"the bug appears."
+"However, we would appreciate it if you try to narrow it down according to "
+"where the bug appears."
msgstr ""
#. type: Plain text
@@ -429,14 +431,14 @@ msgid ""
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
-"is related to bootstrapping tool itself."
+"is related to the bootstrapping tool itself."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:88
msgid ""
"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
-"which we can not fix this directly. Please report such a bug against the "
+"and probably we cannot fix it directly. Please report such a bug against the "
"bootstrapping tool or the failing package."
msgstr ""
@@ -466,9 +468,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:96
msgid ""
-"Also, if you are using a local mirror and/or any of sort of proxy and you "
-"are experiencing a problem, please always reproduce it first by "
-"bootstrapping from an official mirror."
+"Also, if you are using a local mirror and/or any sort of proxy and you are "
+"experiencing a problem, please always reproduce it first by bootstrapping "
+"from an official mirror."
msgstr ""
#. type: Plain text
@@ -481,10 +483,10 @@ msgstr ""
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
-"VMWare or real hardware. If you are using a virtualization technology of any "
-"kind, please always run it on real hardware before reporting a bug. "
-"Providing a screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, whether in Qemu, "
+"Virtualbox, VMWare or real hardware. If you are using a virtualization "
+"technology of any kind, please always run it on real hardware before "
+"reporting a bug. Providing a screenshot of the failure is also very helpful."
msgstr ""
#. type: Plain text
@@ -496,7 +498,7 @@ msgstr ""
#: en/project_bugs.ssi:104
msgid ""
"If a package was successfully installed, but fails while actually running "
-"the Live system, this is probably a bug in Debian Live. However,"
+"the Live system, this is probably a bug in Debian Live. However:"
msgstr ""
#. type: Plain text
@@ -509,8 +511,8 @@ msgstr ""
msgid ""
"Before filing the bug, please search the web for the particular error "
"message or symptom you are getting. As it is highly unlikely that you are "
-"the only person experiencing a particular problem, there is always a chance "
-"that it has been discussed elsewhere, and a possible solution, patch, or "
+"the only person experiencing a particular problem. There is always a chance "
+"that it has been discussed elsewhere and a possible solution, patch, or "
"workaround has been proposed."
msgstr ""
@@ -527,8 +529,8 @@ msgstr ""
#: en/project_bugs.ssi:112
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, live-config and live-tools to see whether something similar has been "
-"reported already."
+"boot, live-config and live-tools to see whether something similar has "
+"already been reported."
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 3c2636f..e5b2174 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,8 +19,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -37,51 +36,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -90,8 +90,7 @@ msgstr ""
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -108,51 +107,52 @@ msgstr ""
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -189,8 +189,8 @@ msgid ""
"While ideally a Debian live system would include files entirely provided by "
"unmodified Debian packages, it is sometimes convenient to provide or modify "
"some content by means of files. Using includes, it is possible to add (or "
-"replace) arbitrary files in your Debian Live image. live-build provides "
-"three mechanisms for using them:"
+"replace) arbitrary files in your Debian Live image. live-build provides two "
+"mechanisms for using them:"
msgstr ""
#. type: Plain text
@@ -212,25 +212,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:16
msgid ""
-"_* Binary includes: These allow you to add or replace Debian specific files "
-"in the binary image, such as the templates and tools directories. Please see "
-"{Binary includes}#binary-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid ""
"Please see {Terms}#terms for more information about the distinction between "
"the \"Live\" and \"binary\" images."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:18
msgid "3~live-chroot-local-includes Live/chroot local includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:22
+#: en/user_customization-contents.ssi:20
msgid ""
"Chroot local includes can be used to add or replace files in the chroot/Live "
"filesystem so that they may be used in the Live system. A typical use is to "
@@ -242,7 +234,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:22
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory #{/}# of the "
@@ -251,7 +243,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:27
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/var/www\n"
@@ -259,12 +251,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:33
+#: en/user_customization-contents.ssi:31
msgid "Your configuration will then have the following layout:"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:44
+#: en/user_customization-contents.ssi:42
#, no-wrap
msgid ""
" -- config\n"
@@ -278,19 +270,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:48
+#: en/user_customization-contents.ssi:46
msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:50
+#: en/user_customization-contents.ssi:48
msgid "3~binary-local-includes Binary local includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: en/user_customization-contents.ssi:50
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 "
@@ -302,61 +294,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:54
#, no-wrap
msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:58
msgid "These files will now appear in the root directory of the live media."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:62
-msgid "3~binary-includes Binary includes"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:64
-msgid ""
-"live-build has some standard files (like documentation) that gets included "
-"in the default configuration on every live media. This can be disabled with:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:68
-#, no-wrap
-msgid " $ lb config --includes none\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:72
-msgid ""
-"Otherwise, the material will be installed by live-build in #{/includes/}# by "
-"default on the media filesystem, or else you can specify an alternate path "
-"with #{--includes}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:74
+#: en/user_customization-contents.ssi:60
msgid "2~hooks Hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:76
+#: en/user_customization-contents.ssi:62
msgid ""
"Hooks allow commands to be performed in the chroot and binary stages of the "
"build in order to customize the image."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:64
msgid "3~live-chroot-local-hooks Live/chroot local hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:66
msgid ""
"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -369,12 +335,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:68
msgid "3~boot-time-hooks Boot-time hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:70
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-"
@@ -386,12 +352,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:72
msgid "3~ Binary local hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:88
+#: en/user_customization-contents.ssi:74
msgid ""
"To run commands in the binary stage, create a hook script with a #{.binary}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -405,12 +371,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:90
+#: en/user_customization-contents.ssi:76
msgid "2~ Preseeding Debconf questions"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:92
+#: en/user_customization-contents.ssi:78
msgid ""
"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
@@ -419,7 +385,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:93
+#: en/user_customization-contents.ssi:79
msgid ""
"For more information about debconf, please see #{debconf(7)}# in the /"
"{debconf}/ package."
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index a0afae8..e48b340 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-08-01 23:16+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -36,9 +36,8 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -66,22 +65,23 @@ msgstr ""
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -107,9 +107,8 @@ msgstr ""
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -137,22 +136,23 @@ msgstr ""
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -212,7 +212,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config --distribution sid\n"
msgstr ""
@@ -540,7 +540,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:138
-msgid "3~ Generated package lists"
+msgid "3~generated-package-lists Generated package lists"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 0ef6493..3dfeb72 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -24,7 +24,7 @@ msgstr ":B~ Beispiele"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -41,51 +41,52 @@ msgstr ":B~ Beispiele"
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -94,7 +95,7 @@ msgstr ""
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -111,77 +112,78 @@ msgstr ""
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34 en/user_examples.ssi:109
+#: en/user_basics.ssi:34 en/user_examples.ssi:107
#, no-wrap
msgid " $ lb config\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:127 en/user_examples.ssi:219
+#: en/user_examples.ssi:125 en/user_examples.ssi:217
#, no-wrap
msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:94
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -312,17 +314,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:59
+#: en/user_examples.ssi:58
#, no-wrap
msgid ""
" $ mkdir tutorial2\n"
" $ cd tutorial2\n"
-" $ lb config -p lxde\n"
-" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-lxde-desktop iceweasel\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:63
+#: en/user_examples.ssi:62
msgid ""
"Our choice of LXDE for this example reflects our desire to provide a minimal "
"desktop environment, since the focus of the image is the single use we have "
@@ -333,30 +334,30 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:65
+#: en/user_examples.ssi:64
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:73
+#: en/user_examples.ssi:72
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:75
+#: en/user_examples.ssi:74
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:76
#, no-wrap
msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:78
msgid ""
"Since we will be changing our personalized image over a number of revisions, "
"and we want to track those changes, trying things experimentally and "
@@ -367,12 +368,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:80
msgid "3~ First revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:86
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -381,64 +382,63 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:91
+#: en/user_examples.ssi:90
msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:101
+#: en/user_examples.ssi:99
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
-" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:105
+#: en/user_examples.ssi:103
msgid ""
"Perform #{lb config}# to generate the config tree, using the #{auto/config}# "
"script you just created:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:111
msgid "Now populate your local package list:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:117
+#: en/user_examples.ssi:115
#, no-wrap
-msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgid " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:119
msgid ""
"First, #{--architectures 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 "
+"much older systems. Third, we have chosen the /{lxde}/ task metapackage to "
+"give us a minimal desktop. And finally, we have added two initial favourite "
"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:121
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:129
msgid ""
"Note that unlike in the first two tutorials, we no longer have to type #"
"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:131
msgid ""
"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
"satisfied it works, it's time to initialize our #{git}# repository, adding "
@@ -446,7 +446,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:139
+#: en/user_examples.ssi:137
#, no-wrap
msgid ""
" $ git init\n"
@@ -455,19 +455,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:141
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:145
+#: en/user_examples.ssi:143
msgid ""
"In this revision, we're going to clean up from the first build, add the /"
"{vlc}/ package to our configuration, rebuild, test and commit."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:145
msgid ""
"The #{lb clean}# command will clean up all generated files from the previous "
"build except for the cache, which saves having to re-download packages. This "
@@ -476,47 +476,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:151
+#: en/user_examples.ssi:149
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:153
msgid ""
"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:157
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:161
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:165
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:169
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:173
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:179
+#: en/user_examples.ssi:177
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -527,7 +527,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:181
+#: en/user_examples.ssi:179
msgid ""
"We've come to the end of our tutorial series. While many more kinds of "
"customization are possible, even just using the few features explored in "
@@ -537,45 +537,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:183
+#: en/user_examples.ssi:181
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:185
+#: en/user_examples.ssi:183
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:185
msgid ""
-"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
-"{xvnc4viewer}/, disabling recommends to make a minimal system:"
+"Make a build directory and create an skeletal configuration inside it, "
+"disabling recommends to make a minimal system. And then create two package "
+"lists: the first one generated with a script provided by live-build named #"
+"{Packages}# (see {Generated package lists}#generated-package-lists), and the "
+"second one including /{xorg}/, /{gdm3}/, /{metacity}/ and /{xvnc4viewer}/."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:195
+#: en/user_examples.ssi:193
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\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"
+" $ lb config -a i386 -k 686-pae --apt-recommends false\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo \"xorg gdm3 metacity xvnc4viewer\" > config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
+#: en/user_examples.ssi:197
msgid ""
-"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
-"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
+"Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a "
+"custom #{.xsession}# in it for the default user that will launch /"
+"{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a "
+"server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -584,7 +587,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:206
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -592,7 +595,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:209
#, no-wrap
msgid ""
" exit\n"
@@ -600,77 +603,84 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:213
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:221
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:223
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:225
#, no-wrap
-msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:227
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
-"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the /"
+"a 128M media size, but without doing anything to destroy the integrity of "
+"the packages contained within, such as the purging of locale data via the /"
"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
-"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority *{important}* "
-"packages will most likely produce a broken live system."
+"particular note, in order to understand what the #{minimal.chroot}# hook "
+"does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:232
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --apt-indices false \\\n"
-" --memtest none --apt-recommends false --includes none\n"
+" $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none\n"
+" $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:236
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:244
msgid ""
-"On the author's system at time of writing, the above configuration produced "
-"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
-"by the default configuration in {Tutorial 1}#tutorial-1."
+"On the author's system at the time of writing this, the above configuration "
+"produced a 95Mbyte image. This compares favourably with the 182Mbyte image "
+"produced by the default configuration in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:246
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-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."
+"system. 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. #{--memtest none}# prevents the "
+"installation of a memory tester. And finally, the execution of the #{minimal}"
+"# hook removes some unused packages and files."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:248
+msgid ""
+"Using other hooks, like for example the #{stripped.chroot}# hook found in #{/"
+"usr/share/doc/live-build/examples/hooks}#, may shave off additional small "
+"amounts of space and produce an image of 76MB. But it is up to you to decide "
+"if the functionality that is sacrificed with each size optimization is worth "
+"the loss of functionality."
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index c94cc38..d06a866 100644
--- a/manual/po/de/user_managing_a_configuration.ssi.po
+++ b/manual/po/de/user_managing_a_configuration.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,7 +19,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -36,51 +36,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -89,7 +90,7 @@ msgstr ""
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -106,51 +107,52 @@ msgstr ""
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -181,127 +183,174 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
msgid ""
-"Live configurations rarely are perfect on the first try. You'll likely need "
-"to make a series of revisions until you are satisfied. However, "
-"inconsistencies can creep into your configuration from one revision to the "
-"next if you aren't careful. The main problem is, once a variable is given a "
-"default value, that value will not be recomputed from other variables that "
-"may change in later revisions."
+"Live configurations rarely are perfect on the first try. It may be fine to "
+"pass #{lb config}# options from the command-line to perform a single build, "
+"but it is more typical to revise those options and build again until you are "
+"satisfied. To support these changes, you will need auto scripts which ensure "
+"your configuration is kept in a consistent state."
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
-msgid ""
-"For example, when the distribution is first set, many 'dependent' variables "
-"are given default values that suit that distribution. However, if you later "
-"decide to change the distribution, those dependent variables continue to "
-"retain old values that are no longer appropriate."
+msgid "3~ Why you need auto"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:14
msgid ""
-"A second, related problem is that if you run #{lb config}# and then upgrade "
-"to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your #"
-"{config/*}# files, which you will then need to use to set the appropriate "
-"option again."
+"The #{lb config}# command stores the options you pass to it in #{config/*}# "
+"files along with many other options set to default values. If you run #{lb "
+"config}# again, it will not reset any option that was defaulted based on "
+"your initial options. So, for example, if you run #{lb config}# again with a "
+"new value for #{--distribution}#, any dependent options that were defaulted "
+"for the old distribution may no longer work with the new. Nor are these "
+"files intended to be read or edited. They store values for over a hundred "
+"options, so nobody, let alone yourself, will be able to see in these which "
+"options you actually specified. And finally, if you run #{lb config}#, then "
+"upgrade live-build and it happens to rename an option, #{config/*}# would "
+"still contain variables named after the old option that are no longer valid."
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:16
msgid ""
-"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
-"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
-"that are designed to help you manage your configuration. Simply create an "
-"auto/config script containing #{lb config}# command with all desired "
-"options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
-"files will be executed. This will ensure that your configuration is kept "
-"internally consistent from one revision to the next and from one live-build "
-"release to the next (Although you will still have to take care and read the "
-"documentation when you upgrade live-build and make adjustments as needed)."
+"For all these reasons, #{auto/*}# scripts will make your life easier. They "
+"are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# "
+"commands that are designed to help you manage your configuration. The #{auto/"
+"config}# script stores your #{lb config}# command with all desired options, "
+"the #{auto/clean}# script removes the files containing configuration "
+"variable values, and the #{auto/build}# script keeps a #{build.log}# of each "
+"build. Each of these scripts is run automatically every time you run the "
+"corresponding #{lb}# command. By using these scripts, your configuration is "
+"easier to read and is kept internally consistent from one revision to the "
+"next. Also, it will be much easier for you identify and fix options which "
+"need to change when you upgrade live-build after reading the updated "
+"documentation."
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
-msgid "2~ Example auto scripts"
+msgid "3~ Use example auto scripts"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:20
msgid ""
-"Use auto script examples such as the following as the starting point for "
-"your new live-build configuration. Take note that when you call the #{lb}# "
-"command that the auto script wraps, you must specify #{noauto}# as its "
-"parameter to ensure that the auto script isn't called again, recursively. "
-"Also, don't forget to ensure the scripts are executable (e.g. #{chmod 755 "
-"auto/*}#)."
+"For your convenience, live-build comes with example auto shell scripts to "
+"copy and edit. Start a new, default configuration, then copy the examples "
+"into it:"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:22
-msgid "#{auto/config}#"
+#: en/user_managing_a_configuration.ssi:25
+#, no-wrap
+msgid ""
+" $ mkdir mylive && cd mylive && lb config\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:29
+msgid "Edit #{auto/config}#, adding any options as you see fit. For instance:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:40
#, no-wrap
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --package-lists \"standard\" \\\n"
+" --architectures i386 \\\n"
+" --linux-flavours 686-pae \\\n"
+" --binary-images hdd \\\n"
+" --mirror-bootstrap http://ftp.es.debian.org/debian/ \\\n"
+" --mirror-binary http://ftp.es.debian.org/debian/ \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:33
-msgid "#{auto/clean}#"
+#: en/user_managing_a_configuration.ssi:44
+msgid ""
+"Now, each time you use #{lb config}#, #{auto/config}# will reset the "
+"configuration based on these options. When you want to make changes to them, "
+"edit the options in this file instead of passing them to #{lb config}#. When "
+"you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files "
+"along with any other build products. And finally, when you use #{lb build}#, "
+"a log of the build will be written by #{auto/build}# in #{build.log}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:41
-#, no-wrap
+#: en/user_managing_a_configuration.ssi:46
msgid ""
-" #!/bin/sh\n"
-" lb clean noauto \"${@}\"\n"
-" rm -f config/binary config/bootstrap \\\n"
-" config/chroot config/common config/source\n"
-" rm -f build.log\n"
+"Note: A special #{noauto}# parameter is used here to suppress another call "
+"to #{auto/config}#, thereby preventing infinite recursion. Make sure you "
+"don't accidentally remove it when making edits. Also, take care to ensure "
+"when you split the #{lb config}# command across multiple lines for "
+"readability, as shown in the example above, that you don't forget the "
+"backslash (\\) at the end of each line that continues to the next."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:45
-msgid "#{auto/build}#"
+#: en/user_managing_a_configuration.ssi:48
+msgid "2~ Clone a configuration published via Git"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-#, no-wrap
msgid ""
-" #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
+"Use the #{lb config --config}# option to clone a Git repository that "
+"contains a Debian Live configuration. If you would like to base your "
+"configuration on one maintained by the Debian Live project, look at http://"
+"live.debian.net/gitweb for the repositories prefixed with #{config-}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:52
msgid ""
-"We now ship example auto scripts with live-build based on the examples "
-"above. You may copy those as your starting point."
+"For example, to build a rescue image, use the #{config-rescue}# repository "
+"as follows:"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:58
+#: en/user_managing_a_configuration.ssi:57
#, no-wrap
-msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
+msgid ""
+" $ mkdir live-rescue && cd live-rescue\n"
+" $ lb config git://live.debian.net/git/config-rescue.git\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:61
msgid ""
-"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
-"example above, #{--package-lists standard}# is set to the default value. "
-"Change this to an appropriate value for your image (or delete it if you want "
-"to use the default) and add any additional options in continuation lines "
-"that follow."
+"Edit #{auto/config}# and any other things you need in the #{config}# tree to "
+"suit your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:63
+msgid ""
+"You may optionally define a shortcut in your Git configuration by adding the "
+"following to your #{${HOME}/.gitconfig}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:68
+#, no-wrap
+msgid ""
+" [url \"git://live.debian.net/git/\"]\n"
+" insteadOf = ldn:\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:72
+msgid ""
+"This enables you to use #{ldn:}# anywhere you need to specify the address of "
+"a #{live.debian.net}# git repository. If you also drop the optional #{.git}# "
+"suffix, starting a new image using this configuration is as easy as:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:76
+#, no-wrap
+msgid " $ lb config ldn:config-rescue\n"
msgstr ""
diff --git a/manual/po/de/user_overview.ssi.po b/manual/po/de/user_overview.ssi.po
index 697fc77..2e41e23 100644
--- a/manual/po/de/user_overview.ssi.po
+++ b/manual/po/de/user_overview.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-16 18:50+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,7 +19,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -36,51 +36,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -89,7 +90,7 @@ msgstr ""
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -106,56 +107,63 @@ msgstr ""
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
+msgstr ""
+
+#. type: Plain text
#: en/user_overview.ssi:2
msgid ":B~ Overview of tools"
msgstr ""
@@ -281,9 +289,9 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config\n"
-" [2012-03-19 15:17:14] lb_config\n"
+" [2012-08-03 22:59:17] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree for a debian system\n"
+" P: Creating config tree for a debian/i386 system\n"
msgstr ""
#. type: Plain text
@@ -298,14 +306,8 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:47
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:51
-#, no-wrap
-msgid " $ lb config -p gnome\n"
+"Normally, you will want to specify some options. For example, to specify "
+"which distribution you want to build using its codename:"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index 52c6961..4beb411 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-08-02 00:07+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\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"
@@ -50,10 +50,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-08-02\n"
+" :published: 2012-08-06\n"
msgstr ""
"@date:\n"
-" :published: 02.08.2012\n"
+" :published: 06.08.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/es/project_bugs.ssi.po b/manual/po/es/project_bugs.ssi.po
index 3a6df27..643c270 100644
--- a/manual/po/es/project_bugs.ssi.po
+++ b/manual/po/es/project_bugs.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-07-21 15:54+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -41,51 +41,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -111,51 +112,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -172,11 +174,17 @@ msgstr "1~bugs Informes de errores."
#. type: Plain text
#: en/project_bugs.ssi:6
+#, fuzzy
+#| msgid ""
+#| "Debian Live is far from being perfect, but we want to make it as close as "
+#| "possible to perfect - with your help. Do not hesitate to report a bug: it "
+#| "is better to fill a report twice than never. However, this chapter "
+#| "includes recommendations how to file good bug reports."
msgid ""
"Debian Live is far from being perfect, but we want to make it as close as "
-"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"possible to perfect - with your help. Do not hesitate to report a bug. It is "
"better to fill a report twice than never. However, this chapter includes "
-"recommendations how to file good bug reports."
+"recommendations on how to file good bug reports."
msgstr ""
"Debian Live está lejos de ser perfecto, pero queremos que sea lo más "
"perfecto posible - con tu ayuda. No dudar en informar de un error: es mejor "
@@ -226,10 +234,15 @@ msgstr "2~ Problemas conocidos"
#. type: Plain text
#: en/project_bugs.ssi:18
+#, fuzzy
+#| msgid ""
+#| "Because Debian *{testing}* and Debian *{unstable}* distributions are a "
+#| "moving target, when you specify either as the target system distribution, "
+#| "a successful build may not always be possible."
msgid ""
-"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
-"moving target, when you specify either as the target system distribution, a "
-"successful build may not always be possible."
+"Since Debian *{testing}* and Debian *{unstable}* distributions are moving "
+"targets, when you specify either of them as the target system distribution, "
+"a successful build may not always be possible."
msgstr ""
"Debido a que Debian *{testing}* y Debian *{unstable}* están cambiando "
"continuamente, no siempre es posible crear un sistema con éxito cuando se "
@@ -242,10 +255,15 @@ msgstr "% FIXME:"
#. type: Plain text
#: en/project_bugs.ssi:22
+#, fuzzy
+#| msgid ""
+#| "If this causes too much difficulty for you, do not build a system based "
+#| "on *{testing}* or *{unstable}*, but rather, use *{stable}*. live-build "
+#| "does always default to the *{stable}* release."
msgid ""
"If this causes too much difficulty for you, do not build a system based on *"
-"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
-"always default to the *{stable}* release."
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always "
+"defaults to the *{stable}* release."
msgstr ""
"Si esto causa mucha dificultad, no se debe crear un sistema basado en *"
"{testing}* o *{unstable}*, sino que debe utilizarse *{stable}*. live-build "
@@ -319,10 +337,16 @@ msgstr "2~collect-information Recopilar información"
#. type: Plain text
#: en/project_bugs.ssi:38
-msgid ""
-"Please provide enough information with your report. At least include the "
-"exact version of live-build version where the bug is encountered and steps "
-"to reproduce it. Please use common sense and include other relevant "
+#, fuzzy
+#| msgid ""
+#| "Please provide enough information with your report. At least include the "
+#| "exact version of live-build version where the bug is encountered and "
+#| "steps to reproduce it. Please use common sense and include other relevant "
+#| "information if you think that it might help in solving the problem."
+msgid ""
+"Please provide enough information with your report. Include, at least, the "
+"exact version of live-build where the bug is encountered and the steps to "
+"reproduce it. Please use your common sense and provide any other relevant "
"information if you think that it might help in solving the problem."
msgstr ""
"Se debe proporcionar información suficiente con el informe. Como mínimo, la "
@@ -388,9 +412,14 @@ msgstr "_* Versión del kernel en el sistema en vivo."
#. type: Plain text
#: en/project_bugs.ssi:60
+#, fuzzy
+#| msgid ""
+#| "You can generate a log of the build process by using the #{tee}# command. "
+#| "We recommend doing this automatically with an #{auto/build}# script; (see "
+#| "{Managing a configuration}#managing-a-configuration for details)."
msgid ""
"You can generate a log of the build process by using the #{tee}# command. We "
-"recommend doing this automatically with an #{auto/build}# script; (see "
+"recommend doing this automatically with an #{auto/build}# script (see "
"{Managing a configuration}#managing-a-configuration for details)."
msgstr ""
"Se puede generar un log del proceso de creación mediante el comando #{tee}#. "
@@ -399,8 +428,8 @@ msgstr ""
"detalles)."
#. type: Plain text
-#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr " # lb build 2>&1 | tee build.log\n"
@@ -450,11 +479,22 @@ msgstr "2~ Aislar el fallo si es posible"
#. type: Plain text
#: en/project_bugs.ssi:76
+#, fuzzy
+#| msgid ""
+#| "If possible, isolate the failing case to the smallest possible change "
+#| "that breaks. It is not always easy to do this, so if you can't manage it "
+#| "for your report, don't worry. However, if you plan your development cycle "
+#| "well, using small enough change sets per iteration, you may be able to "
+#| "isolate the problem by constructing a simpler 'base' configuration that "
+#| "closely matches your actual configuration plus just the broken change set "
+#| "added to it. If you have a hard time sorting out which of your changes "
+#| "broke, it may be that you are including too much in each change set and "
+#| "should develop in smaller increments."
msgid ""
"If possible, isolate the failing case to the smallest possible change that "
-"breaks. It is not always easy to do this, so if you can't manage it for your "
-"report, don't worry. However, if you plan your development cycle well, using "
-"small enough change sets per iteration, you may be able to isolate the "
+"breaks. It is not always easy to do this so if you cannot manage it for your "
+"report, do not worry. However, if you plan your development cycle well, "
+"using small enough change sets per iteration, you may be able to isolate the "
"problem by constructing a simpler 'base' configuration that closely matches "
"your actual configuration plus just the broken change set added to it. If "
"you have a hard time sorting out which of your changes broke, it may be that "
@@ -479,10 +519,15 @@ msgstr "2~ Utilizar el paquete correcto sobre el que informar del error"
#. type: Plain text
#: en/project_bugs.ssi:80
+#, fuzzy
+#| msgid ""
+#| "If you don't know what component is responsible for the bug or if the bug "
+#| "is a general bug concerning live systems, you can fill a bug against the "
+#| "debian-live pseudo-package."
msgid ""
-"If you don't know what component is responsible for the bug or if the bug is "
-"a general bug concerning live systems, you can fill a bug against the debian-"
-"live pseudo-package."
+"If you do not know what component is responsible for the bug or if the bug "
+"is a general bug concerning live systems, you can fill a bug against the "
+"debian-live pseudo-package."
msgstr ""
"Si no se sabe qué componente es responsable del error o si el error es un "
"error general relativo a los sistemas en vivo, se puede rellenar un informe "
@@ -490,9 +535,13 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:82
+#, fuzzy
+#| msgid ""
+#| "However, we would appreciate if you try to narrow it down according to "
+#| "where the bug appears."
msgid ""
-"However, we would appreciate if you try to narrow it down according to where "
-"the bug appears."
+"However, we would appreciate it if you try to narrow it down according to "
+"where the bug appears."
msgstr ""
"Sin embargo, se agradece si se intenta limitar la búsqueda a donde aparece "
"el error."
@@ -504,12 +553,19 @@ msgstr "3~ En la preinstalación (bootstrap) en tiempo de creación."
#. type: Plain text
#: en/project_bugs.ssi:86
+#, fuzzy
+#| msgid ""
+#| "live-build first bootstraps a basic Debian system with /{debootstrap}/ "
+#| "or /{cdebootstrap}/. Depending on the bootstrapping tool used and the "
+#| "Debian distribution it is bootstrapping, it may fail. If a bug appears "
+#| "here, check if the error is related to a specific Debian package (most "
+#| "likely), or if it is related to bootstrapping tool itself."
msgid ""
"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
-"is related to bootstrapping tool itself."
+"is related to the bootstrapping tool itself."
msgstr ""
"live-build arranca primero un sistema Debian básico con /{debootstrap}/ o /"
"{cdebootstrap}/. Puede fallar dependiendo de la herramienta usada en la "
@@ -520,9 +576,14 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:88
+#, fuzzy
+#| msgid ""
+#| "In both cases, this is not a bug in Debian Live, but rather in Debian "
+#| "itself which we can not fix this directly. Please report such a bug "
+#| "against the bootstrapping tool or the failing package."
msgid ""
"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
-"which we can not fix this directly. Please report such a bug against the "
+"and probably we cannot fix it directly. Please report such a bug against the "
"bootstrapping tool or the failing package."
msgstr ""
"En ambos casos, esto no es un error de Debian Live, sino de Debian en sí "
@@ -563,10 +624,15 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:96
+#, fuzzy
+#| msgid ""
+#| "Also, if you are using a local mirror and/or any of sort of proxy and you "
+#| "are experiencing a problem, please always reproduce it first by "
+#| "bootstrapping from an official mirror."
msgid ""
-"Also, if you are using a local mirror and/or any of sort of proxy and you "
-"are experiencing a problem, please always reproduce it first by "
-"bootstrapping from an official mirror."
+"Also, if you are using a local mirror and/or any sort of proxy and you are "
+"experiencing a problem, please always reproduce it first by bootstrapping "
+"from an official mirror."
msgstr ""
"Además, si se está utilizando una réplica local y/o cualquier tipo de proxy "
"y se experimenta un problema, se debe intentar reproducir siempre "
@@ -579,13 +645,22 @@ msgstr "3~ En tiempo de arranque"
#. type: Plain text
#: en/project_bugs.ssi:100
+#, fuzzy
+#| msgid ""
+#| "If your image does not boot, please report it to the mailing list "
+#| "together with the information requested in {Collect information}#collect-"
+#| "information. Do not forget to mention, how/when the image failed, in "
+#| "Qemu, Virtualbox, VMWare or real hardware. If you are using a "
+#| "virtualization technology of any kind, please always run it on real "
+#| "hardware before reporting a bug. Providing a screenshot of the failure is "
+#| "also very helpful."
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
-"VMWare or real hardware. If you are using a virtualization technology of any "
-"kind, please always run it on real hardware before reporting a bug. "
-"Providing a screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, whether in Qemu, "
+"Virtualbox, VMWare or real hardware. If you are using a virtualization "
+"technology of any kind, please always run it on real hardware before "
+"reporting a bug. Providing a screenshot of the failure is also very helpful."
msgstr ""
"Si la imagen no arranca, se debería informar la lista de correo, junto con "
"la información solicitada en {Recopilar información}#collect-information. No "
@@ -602,9 +677,13 @@ msgstr "3~ En tiempo de ejecución"
#. type: Plain text
#: en/project_bugs.ssi:104
+#, fuzzy
+#| msgid ""
+#| "If a package was successfully installed, but fails while actually running "
+#| "the Live system, this is probably a bug in Debian Live. However,"
msgid ""
"If a package was successfully installed, but fails while actually running "
-"the Live system, this is probably a bug in Debian Live. However,"
+"the Live system, this is probably a bug in Debian Live. However:"
msgstr ""
"Si un paquete se ha instalado correctamente, pero falla cuando se ejecuta el "
"sistema en vivo, esto es probablemente un error en Debian Live. Sin embargo,"
@@ -616,11 +695,18 @@ msgstr "2~ Hacer la investigación"
#. type: Plain text
#: en/project_bugs.ssi:108
+#, fuzzy
+#| msgid ""
+#| "Before filing the bug, please search the web for the particular error "
+#| "message or symptom you are getting. As it is highly unlikely that you are "
+#| "the only person experiencing a particular problem, there is always a "
+#| "chance that it has been discussed elsewhere, and a possible solution, "
+#| "patch, or workaround has been proposed."
msgid ""
"Before filing the bug, please search the web for the particular error "
"message or symptom you are getting. As it is highly unlikely that you are "
-"the only person experiencing a particular problem, there is always a chance "
-"that it has been discussed elsewhere, and a possible solution, patch, or "
+"the only person experiencing a particular problem. There is always a chance "
+"that it has been discussed elsewhere and a possible solution, patch, or "
"workaround has been proposed."
msgstr ""
"Antes de presentar el informe de errores, buscar en la web el mensaje de "
@@ -644,10 +730,15 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:112
+#, fuzzy
+#| msgid ""
+#| "In addition, you should check the current bug lists for live-build, live-"
+#| "boot, live-config and live-tools to see whether something similar has "
+#| "been reported already."
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, live-config and live-tools to see whether something similar has been "
-"reported already."
+"boot, live-config and live-tools to see whether something similar has "
+"already been reported."
msgstr ""
"Además, se debe comprobar las listas de errores actuales de live-build, live-"
"boot, live-config y live-tools y verificar si se ha informado ya de algo "
diff --git a/manual/po/es/user_customization-contents.ssi.po b/manual/po/es/user_customization-contents.ssi.po
index b96bb25..fa9dcd2 100644
--- a/manual/po/es/user_customization-contents.ssi.po
+++ b/manual/po/es/user_customization-contents.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-02-19 18:05+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -20,8 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -38,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -91,8 +91,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -109,51 +108,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -195,12 +195,19 @@ msgstr "2~includes Includes"
#. type: Plain text
#: en/user_customization-contents.ssi:10
+#, fuzzy
+#| msgid ""
+#| "While ideally a Debian live system would include files entirely provided "
+#| "by unmodified Debian packages, it is sometimes convenient to provide or "
+#| "modify some content by means of files. Using includes, it is possible to "
+#| "add (or replace) arbitrary files in your Debian Live image. live-build "
+#| "provides three mechanisms for using them:"
msgid ""
"While ideally a Debian live system would include files entirely provided by "
"unmodified Debian packages, it is sometimes convenient to provide or modify "
"some content by means of files. Using includes, it is possible to add (or "
-"replace) arbitrary files in your Debian Live image. live-build provides "
-"three mechanisms for using them:"
+"replace) arbitrary files in your Debian Live image. live-build provides two "
+"mechanisms for using them:"
msgstr ""
"Idealmente, un sistema Debain Live debería incluir solamente ficheros que "
"son obtenidos de paquetes Debian no modificados. Sin embargo, algunas veces "
@@ -234,18 +241,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:16
msgid ""
-"_* Binary includes: These allow you to add or replace Debian specific files "
-"in the binary image, such as the templates and tools directories. Please see "
-"{Binary includes}#binary-includes for more information."
-msgstr ""
-"_* Includes en Binary: Estos includes permiten incluir o reemplazar ficheros "
-"específicos de Debian en la imagen binaria, como pueden ser plantillas o "
-"directorios de herramientas. Para más información ver {Includes en Binary}"
-"#binary-includes"
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid ""
"Please see {Terms}#terms for more information about the distinction between "
"the \"Live\" and \"binary\" images."
msgstr ""
@@ -253,12 +248,12 @@ msgstr ""
"\"binary\" ver {Términos}#terms "
#. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:18
msgid "3~live-chroot-local-includes Live/chroot local includes"
msgstr "3~live-chroot-local-includes Includes locales en Live/chroot"
#. type: Plain text
-#: en/user_customization-contents.ssi:22
+#: en/user_customization-contents.ssi:20
msgid ""
"Chroot local includes can be used to add or replace files in the chroot/Live "
"filesystem so that they may be used in the Live system. A typical use is to "
@@ -279,7 +274,7 @@ msgstr ""
"gancho locales en Live/chroot}#live-chroot-local-hooks"
#. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:22
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory #{/}# of the "
@@ -293,7 +288,7 @@ msgstr ""
"# del sistema en vivo se puede hacer lo siguiente:"
#. type: Plain text
-#: en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:27
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/var/www\n"
@@ -301,12 +296,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:33
+#: en/user_customization-contents.ssi:31
msgid "Your configuration will then have the following layout:"
msgstr "El directorio de configuración presentará la siguiente jerarquía:"
#. type: Plain text
-#: en/user_customization-contents.ssi:44
+#: en/user_customization-contents.ssi:42
#, no-wrap
msgid ""
" -- config\n"
@@ -320,7 +315,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:48
+#: en/user_customization-contents.ssi:46
msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
@@ -330,12 +325,12 @@ msgstr ""
"que los paquetes puedan haber instalado."
#. type: Plain text
-#: en/user_customization-contents.ssi:50
+#: en/user_customization-contents.ssi:48
msgid "3~binary-local-includes Binary local includes"
msgstr "3~binary-local-includes Includes locales en Binary "
#. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: en/user_customization-contents.ssi:50
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 "
@@ -358,58 +353,25 @@ msgstr ""
"siguiente manera:"
#. type: Plain text
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:54
#, no-wrap
msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:58
msgid "These files will now appear in the root directory of the live media."
msgstr ""
"Los ficheros aparecerán en el directorio raíz del medio desde el que se "
"instalará el sistema en vivo."
#. type: Plain text
-#: en/user_customization-contents.ssi:62
-msgid "3~binary-includes Binary includes"
-msgstr "3~binary-includes Includes en Binary "
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:64
-msgid ""
-"live-build has some standard files (like documentation) that gets included "
-"in the default configuration on every live media. This can be disabled with:"
-msgstr ""
-"live-build tiene algún fichero estandar, como puede ser la documentación, "
-"que se incluyen por defecto en el medio de instalación. Esto puede ser "
-"desactivado con:"
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:68
-#, no-wrap
-msgid " $ lb config --includes none\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:72
-msgid ""
-"Otherwise, the material will be installed by live-build in #{/includes/}# by "
-"default on the media filesystem, or else you can specify an alternate path "
-"with #{--includes}#."
-msgstr ""
-"Si no se utiliza esta opción, live-build instalará el material en el "
-"directorio #{/includes/}# del sistema de ficheros del medio de instalación "
-"por defecto. En lugar de none, se puede especificar un directorio "
-"alternativo mediante la misma opción #{--includes}#."
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:74
+#: en/user_customization-contents.ssi:60
msgid "2~hooks Hooks"
msgstr "2~hooks Scripts gancho (Hooks)"
#. type: Plain text
-#: en/user_customization-contents.ssi:76
+#: en/user_customization-contents.ssi:62
msgid ""
"Hooks allow commands to be performed in the chroot and binary stages of the "
"build in order to customize the image."
@@ -418,12 +380,12 @@ msgstr ""
"las etapas chroot y binary. "
#. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:64
msgid "3~live-chroot-local-hooks Live/chroot local hooks"
msgstr "3~live-chroot-local-hooks Scripts gancho locales en Live/chroot"
#. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:66
msgid ""
"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -447,12 +409,12 @@ msgstr ""
"simbólico en la propia configuración."
#. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:68
msgid "3~boot-time-hooks Boot-time hooks"
msgstr "3~boot-time-hooks Scripts gancho en tiempo de arranque"
#. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:70
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-"
@@ -474,12 +436,12 @@ msgstr ""
"paquetes modificados}#installing-modified-or-third-party-packages."
#. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:72
msgid "3~ Binary local hooks"
msgstr "3~ Scripts gancho locales en Binary"
#. type: Plain text
-#: en/user_customization-contents.ssi:88
+#: en/user_customization-contents.ssi:74
msgid ""
"To run commands in the binary stage, create a hook script with a #{.binary}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -505,12 +467,12 @@ msgstr ""
"enlaces simbólicos."
#. type: Plain text
-#: en/user_customization-contents.ssi:90
+#: en/user_customization-contents.ssi:76
msgid "2~ Preseeding Debconf questions"
msgstr "2~ Preconfiguración de las preguntas de Debconf"
#. type: Plain text
-#: en/user_customization-contents.ssi:92
+#: en/user_customization-contents.ssi:78
msgid ""
"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
@@ -523,7 +485,7 @@ msgstr ""
"{debconf-set-selections}# durante la etapa correspondiente."
#. type: Plain text
-#: en/user_customization-contents.ssi:93
+#: en/user_customization-contents.ssi:79
msgid ""
"For more information about debconf, please see #{debconf(7)}# in the /"
"{debconf}/ package."
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index def3c6e..0a7cc39 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-08-01 23:16+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-08-01 23:32+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
@@ -38,9 +38,8 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -68,22 +67,23 @@ msgstr ""
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -109,9 +109,8 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -139,22 +138,23 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -245,7 +245,7 @@ msgstr ""
"sid, se debe indicar: "
#. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config --distribution sid\n"
msgstr " $ lb config --distribution sid\n"
@@ -695,8 +695,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:138
-msgid "3~ Generated package lists"
-msgstr "3~ Listas de paquetes generadas"
+#, fuzzy
+#| msgid "3~package-lists Package lists"
+msgid "3~generated-package-lists Generated package lists"
+msgstr "3~package-lists Listas de paquetes"
#. type: Plain text
#: en/user_customization-packages.ssi:140
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index 64d392b..75b86c9 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-07-09 23:00+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -29,7 +29,7 @@ msgstr ":B~ Ejemplos"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -46,51 +46,52 @@ msgstr ":B~ Ejemplos"
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -99,7 +100,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -116,77 +117,78 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr " # lb build 2>&1 | tee build.log\n"
#. type: Plain text
-#: en/user_basics.ssi:34 en/user_examples.ssi:109
+#: en/user_basics.ssi:34 en/user_examples.ssi:107
#, no-wrap
msgid " $ lb config\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:127 en/user_examples.ssi:219
+#: en/user_examples.ssi:125 en/user_examples.ssi:217
#, no-wrap
msgid " # lb build\n"
msgstr " # lb build\n"
#. type: Plain text
-#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:94
#, no-wrap
msgid " #!/bin/sh\n"
msgstr " #!/bin/sh\n"
@@ -357,17 +359,21 @@ msgstr ""
"imágenes de Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:59
-#, no-wrap
+#: en/user_examples.ssi:58
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ lb config\n"
+#| " $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
msgid ""
" $ mkdir tutorial2\n"
" $ cd tutorial2\n"
-" $ lb config -p lxde\n"
-" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-lxde-desktop iceweasel\" >> config/package-lists/my.list.chroot\n"
msgstr ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:63
+#: en/user_examples.ssi:62
msgid ""
"Our choice of LXDE for this example reflects our desire to provide a minimal "
"desktop environment, since the focus of the image is the single use we have "
@@ -385,7 +391,7 @@ msgstr ""
"como un ejercicio para el lector."
#. type: Plain text
-#: en/user_examples.ssi:65
+#: en/user_examples.ssi:64
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
@@ -394,25 +400,25 @@ msgstr ""
"{Tutorial 1}#tutorial-1:"
#. type: Plain text
-#: en/user_examples.ssi:73
+#: en/user_examples.ssi:72
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
"De nuevo, verificar que la imagen está bien y probarla igual que en el "
"{Tutorial 1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:75
+#: en/user_examples.ssi:74
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr "2~tutorial-3 Tutorial 3: Una imagen personalizada"
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:76
#, no-wrap
msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr "*{Caso práctico:}* Crear un proyecto para conseguir una imagen personalizada, que contenga el software favorito para llevárselo en una memoria USB donde quiera que se vaya, y hacerlo evolucionar en revisiones sucesivas, tal y como vayan cambiando las necesidades y preferencias.\n"
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:78
msgid ""
"Since we will be changing our personalized image over a number of revisions, "
"and we want to track those changes, trying things experimentally and "
@@ -430,12 +436,12 @@ msgstr ""
"#managing-a-configuration."
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:80
msgid "3~ First revision"
msgstr "3~ Primera revisión"
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:86
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -444,23 +450,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:91
+#: en/user_examples.ssi:90
msgid "Edit #{auto/config}# to read as follows:"
msgstr "Editar #{auto/config}# del siguiente modo:"
#. type: Plain text
-#: en/user_examples.ssi:101
+#: en/user_examples.ssi:99
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
-" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:105
+#: en/user_examples.ssi:103
msgid ""
"Perform #{lb config}# to generate the config tree, using the #{auto/config}# "
"script you just created:"
@@ -469,24 +474,33 @@ msgstr ""
"script #{auto/config}# que justo se acaba de crear:"
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:111
msgid "Now populate your local package list:"
msgstr "Completar la lista de paquetes local:"
#. type: Plain text
-#: en/user_examples.ssi:117
-#, no-wrap
-msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
-msgstr ""
+#: en/user_examples.ssi:115
+#, fuzzy, no-wrap
+#| msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
+msgid " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgstr " $ echo vlc >> config/package-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:119
+#, fuzzy
+#| msgid ""
+#| "First, #{--architectures 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}/."
msgid ""
"First, #{--architectures 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 "
+"much older systems. Third, we have chosen the /{lxde}/ task metapackage to "
+"give us a minimal desktop. And finally, we have added two initial favourite "
"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
"En primer lugar con #{--architectures i386}# se asegura de que en nuestro "
@@ -498,12 +512,12 @@ msgstr ""
"iniciales favoritos: /{iceweasel}/ y /{xchat}/."
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:121
msgid "Now, build the image:"
msgstr "Ahora, crear la imagen:"
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:129
msgid ""
"Note that unlike in the first two tutorials, we no longer have to type #"
"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
@@ -513,7 +527,7 @@ msgstr ""
"{auto/build}#."
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:131
msgid ""
"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
"satisfied it works, it's time to initialize our #{git}# repository, adding "
@@ -525,7 +539,7 @@ msgstr ""
"primer commit:"
#. type: Plain text
-#: en/user_examples.ssi:139
+#: en/user_examples.ssi:137
#, no-wrap
msgid ""
" $ git init\n"
@@ -534,12 +548,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:141
msgid "3~ Second revision"
msgstr "3~ Segunda revisión"
#. type: Plain text
-#: en/user_examples.ssi:145
+#: en/user_examples.ssi:143
msgid ""
"In this revision, we're going to clean up from the first build, add the /"
"{vlc}/ package to our configuration, rebuild, test and commit."
@@ -549,7 +563,7 @@ msgstr ""
"cambios al git."
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:145
msgid ""
"The #{lb clean}# command will clean up all generated files from the previous "
"build except for the cache, which saves having to re-download packages. This "
@@ -563,13 +577,13 @@ msgstr ""
"nueva configuración."
#. type: Plain text
-#: en/user_examples.ssi:151
+#: en/user_examples.ssi:149
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:153
msgid ""
"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
@@ -578,35 +592,35 @@ msgstr ""
"{config/package-lists/my.list.chroot}#:"
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:157
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr " $ echo vlc >> config/package-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:161
msgid "Build again:"
msgstr "Crear de nuevo:"
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:165
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:169
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
"Probar, y cuando se esté satisfecho, enviar la próxima revisión al git:"
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:173
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:179
+#: en/user_examples.ssi:177
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -624,7 +638,7 @@ msgstr ""
"scripts #{auto}#."
#. type: Plain text
-#: en/user_examples.ssi:181
+#: en/user_examples.ssi:179
msgid ""
"We've come to the end of our tutorial series. While many more kinds of "
"customization are possible, even just using the few features explored in "
@@ -640,44 +654,49 @@ msgstr ""
"experiencias recogidas de los usuarios de Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:183
+#: en/user_examples.ssi:181
msgid "2~ A VNC Kiosk Client"
msgstr "2~ Un cliente VNC kiosk"
#. type: Plain text
-#: en/user_examples.ssi:185
+#: en/user_examples.ssi:183
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr "*{Caso Práctico:}* Crear una imagen con live-build para arrancar directamente un servidor VNC.\n"
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:185
msgid ""
-"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
-"{xvnc4viewer}/, disabling recommends to make a minimal system:"
+"Make a build directory and create an skeletal configuration inside it, "
+"disabling recommends to make a minimal system. And then create two package "
+"lists: the first one generated with a script provided by live-build named #"
+"{Packages}# (see {Generated package lists}#generated-package-lists), and the "
+"second one including /{xorg}/, /{gdm3}/, /{metacity}/ and /{xvnc4viewer}/."
msgstr ""
-"Hacer un directorio de creación y crear una configuración en esqueleto según "
-"la lista estándar-x11, incluyendo /{gdm3}/, /{metacity}/ y /{xvnc4viewer}/, "
-"desactivando los paquetes recomendados para conseguir un sistema mínimo:"
#. type: Plain text
-#: en/user_examples.ssi:195
+#: en/user_examples.ssi:193
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\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"
+" $ lb config -a i386 -k 686-pae --apt-recommends false\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo \"xorg gdm3 metacity xvnc4viewer\" > config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
+#: en/user_examples.ssi:197
+#, fuzzy
+#| msgid ""
+#| "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it "
+#| "for the default user that will launch /{metacity}/ and start /"
+#| "{xvncviewer}/, connecting to port #{5901}# on a server at #{192.168.1.2}#:"
msgid ""
-"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
-"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
+"Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a "
+"custom #{.xsession}# in it for the default user that will launch /"
+"{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a "
+"server at #{192.168.1.2}#:"
msgstr ""
"Crear el directorio #{/etc/skel}# y poner un fichero #{.xsession}# "
"personalizado para el usuario que por defecto ejecutará /{metacity}/ e "
@@ -685,7 +704,7 @@ msgstr ""
"{192.168.1.2}#:"
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -694,7 +713,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:206
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -702,7 +721,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:209
#, no-wrap
msgid ""
" exit\n"
@@ -710,38 +729,50 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:213
msgid "Build the image:"
msgstr "Crear la imagen:"
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:221
msgid "Enjoy."
msgstr "Disfrutarlo."
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:223
msgid "2~ A base image for a 128M USB key"
msgstr "2~ Una imagen básica para un pendrive USB de 128M"
#. type: Plain text
-#: en/user_examples.ssi:227
-#, no-wrap
-msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+#: en/user_examples.ssi:225
+#, fuzzy, no-wrap
+#| msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.\n"
msgstr "*{Caso Práctico:}* Crear una imagen estándar quitando algunos componentes para que quepa en un pendrive USB de 128M dejándo espacio libre para poder usarlo.\n"
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:227
+#, fuzzy
+#| msgid ""
+#| "When optimizing an image to fit a certain media size, you need to "
+#| "understand the tradeoffs you are making between size and functionality. "
+#| "In this example, we trim only so much as to make room for additional "
+#| "material within a 128M media size, but without doing anything to destroy "
+#| "integrity of the packages contained within, such as the purging of locale "
+#| "data via the /{localepurge}/ package, or other such \"intrusive\" "
+#| "optimizations. Of particular note, you should not use #{--bootstrap-"
+#| "flavour minimal}# unless you really know what you're doing, as omitting "
+#| "priority *{important}* packages will most likely produce a broken live "
+#| "system."
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
-"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the /"
+"a 128M media size, but without doing anything to destroy the integrity of "
+"the packages contained within, such as the purging of locale data via the /"
"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
-"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority *{important}* "
-"packages will most likely produce a broken live system."
+"particular note, in order to understand what the #{minimal.chroot}# hook "
+"does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#"
msgstr ""
"Al optimizar una imagen para adaptarla al tamaño de algunos medios de "
"almacenamiento, es necesario comprender el equilibrio que se está haciendo "
@@ -755,24 +786,29 @@ msgstr ""
"probable es que se produzca un sistema roto."
#. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:232
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --apt-indices false \\\n"
-" --memtest none --apt-recommends false --includes none\n"
+" $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none\n"
+" $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:236
msgid "Now, build the image in the usual way:"
msgstr "Ahora, crear la imagen de forma habitual:"
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:244
+#, fuzzy
+#| msgid ""
+#| "On the author's system at time of writing, the above configuration "
+#| "produced a 78Mbyte image. This compares favourably with the 166Mbyte "
+#| "image produced by the default configuration in {Tutorial 1}#tutorial-1."
msgid ""
-"On the author's system at time of writing, the above configuration produced "
-"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
-"by the default configuration in {Tutorial 1}#tutorial-1."
+"On the author's system at the time of writing this, the above configuration "
+"produced a 95Mbyte image. This compares favourably with the 182Mbyte image "
+"produced by the default configuration in {Tutorial 1}#tutorial-1."
msgstr ""
"En el sistema del autor, en el momento de escribir esto, la configuración "
"anterior produjo una imagen de 78Mbytes. Esto se compara favorablemente en "
@@ -780,21 +816,34 @@ msgstr ""
"en el {Tutorial 1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:246
+#, 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-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."
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-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."
+"system. 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. #{--memtest none}# prevents the "
+"installation of a memory tester. And finally, the execution of the #{minimal}"
+"# hook removes some unused packages and files."
msgstr ""
"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 "
@@ -812,6 +861,16 @@ msgstr ""
"funcionalidad que se sacrifica con cada optimización."
#. type: Plain text
+#: en/user_examples.ssi:248
+msgid ""
+"Using other hooks, like for example the #{stripped.chroot}# hook found in #{/"
+"usr/share/doc/live-build/examples/hooks}#, may shave off additional small "
+"amounts of space and produce an image of 76MB. But it is up to you to decide "
+"if the functionality that is sacrificed with each size optimization is worth "
+"the loss of functionality."
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:250
msgid "2~ A localized KDE desktop and installer"
msgstr "2~ Un escritorio KDE con variante local e instalador"
diff --git a/manual/po/es/user_managing_a_configuration.ssi.po b/manual/po/es/user_managing_a_configuration.ssi.po
index 9f08a8a..b63024d 100644
--- a/manual/po/es/user_managing_a_configuration.ssi.po
+++ b/manual/po/es/user_managing_a_configuration.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-03-19 20:54+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -24,7 +24,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -41,51 +41,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -94,7 +95,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -111,51 +112,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -190,69 +192,62 @@ msgstr "2~ Utilización de auto para gestionar los cambios de la configuración"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
msgid ""
-"Live configurations rarely are perfect on the first try. You'll likely need "
-"to make a series of revisions until you are satisfied. However, "
-"inconsistencies can creep into your configuration from one revision to the "
-"next if you aren't careful. The main problem is, once a variable is given a "
-"default value, that value will not be recomputed from other variables that "
-"may change in later revisions."
+"Live configurations rarely are perfect on the first try. It may be fine to "
+"pass #{lb config}# options from the command-line to perform a single build, "
+"but it is more typical to revise those options and build again until you are "
+"satisfied. To support these changes, you will need auto scripts which ensure "
+"your configuration is kept in a consistent state."
msgstr ""
-"La configuración necesaria para crear un sistema en vivo rara vez es "
-"perfecta a la primera. Lo normal es que se necesite realizar una serie de "
-"revisiones hasta que se obtenga algo satisfactorio. Sin embargo, las "
-"inconsistencias pueden transmitirse de una revisión de la configuración a "
-"otra si no se es lo suficientemente cuidadoso. El principal problema es que, "
-"una vez que una variable de la configuración tiene un valor asignado, este "
-"valor no es recalculado en revisiones posteriores de la configuración. Esto "
-"hace que, si una variable depende del valor de otra y esta segunda cambia de "
-"valor, el valor actual de la primera no se ve alterado, debido a que ya "
-"tenía el valor asignado de antemano."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
-msgid ""
-"For example, when the distribution is first set, many 'dependent' variables "
-"are given default values that suit that distribution. However, if you later "
-"decide to change the distribution, those dependent variables continue to "
-"retain old values that are no longer appropriate."
+msgid "3~ Why you need auto"
msgstr ""
-"Por ejemplo, la primera vez que se asigna la distribución a utilizar, se "
-"asigna a muchas variables un valor por defecto para adecuarse a la "
-"distribución seleccionada. Sin embargo, si posteriormente se decide "
-"modificar la distribución, estas variables dependientes continuan reteniendo "
-"los valores antiguos que, por supuesto, no son los adecuados para la nueva "
-"distribución."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:14
msgid ""
-"A second, related problem is that if you run #{lb config}# and then upgrade "
-"to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your #"
-"{config/*}# files, which you will then need to use to set the appropriate "
-"option again."
+"The #{lb config}# command stores the options you pass to it in #{config/*}# "
+"files along with many other options set to default values. If you run #{lb "
+"config}# again, it will not reset any option that was defaulted based on "
+"your initial options. So, for example, if you run #{lb config}# again with a "
+"new value for #{--distribution}#, any dependent options that were defaulted "
+"for the old distribution may no longer work with the new. Nor are these "
+"files intended to be read or edited. They store values for over a hundred "
+"options, so nobody, let alone yourself, will be able to see in these which "
+"options you actually specified. And finally, if you run #{lb config}#, then "
+"upgrade live-build and it happens to rename an option, #{config/*}# would "
+"still contain variables named after the old option that are no longer valid."
msgstr ""
-"Otro problema es que la ejecución de la orden #{lb config}# no se "
-"reejecutará correctamente si se realiza una actualización a una nueva "
-"versión de las herramientas live-build que modifique el nombre de alguna "
-"variable de configuración. Además solamente podrá ser descubierto mediante "
-"una revisión manual de los ficheros del directorio #{config/*}# que se "
-"deberán modificar para asignar las variables de configuración a un nuevo "
-"valor apropiado."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:16
+#, fuzzy
+#| msgid ""
+#| "All of this would be a terrible nuisance if it weren't for auto/* "
+#| "scripts, simple wrappers to the #{lb config}#, #{lb build}# and #{lb "
+#| "clean}# commands that are designed to help you manage your configuration. "
+#| "Simply create an auto/config script containing #{lb config}# command with "
+#| "all desired options, and an auto/clean that removes the files containing "
+#| "configuration variable values, and each time you run #{lb config}# and #"
+#| "{lb clean}#, these files will be executed. This will ensure that your "
+#| "configuration is kept internally consistent from one revision to the next "
+#| "and from one live-build release to the next (Although you will still have "
+#| "to take care and read the documentation when you upgrade live-build and "
+#| "make adjustments as needed)."
msgid ""
-"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
-"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
-"that are designed to help you manage your configuration. Simply create an "
-"auto/config script containing #{lb config}# command with all desired "
-"options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
-"files will be executed. This will ensure that your configuration is kept "
-"internally consistent from one revision to the next and from one live-build "
-"release to the next (Although you will still have to take care and read the "
-"documentation when you upgrade live-build and make adjustments as needed)."
+"For all these reasons, #{auto/*}# scripts will make your life easier. They "
+"are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# "
+"commands that are designed to help you manage your configuration. The #{auto/"
+"config}# script stores your #{lb config}# command with all desired options, "
+"the #{auto/clean}# script removes the files containing configuration "
+"variable values, and the #{auto/build}# script keeps a #{build.log}# of each "
+"build. Each of these scripts is run automatically every time you run the "
+"corresponding #{lb}# command. By using these scripts, your configuration is "
+"easier to read and is kept internally consistent from one revision to the "
+"next. Also, it will be much easier for you identify and fix options which "
+"need to change when you upgrade live-build after reading the updated "
+"documentation."
msgstr ""
"Todo esto sería un terrible embrollo si no fuese por los scripts auto/* "
"simples envoltorios para los comandos #{lb config}#, #{lb build}# y #{lb "
@@ -270,98 +265,129 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
-msgid "2~ Example auto scripts"
+#, fuzzy
+#| msgid "2~ Example auto scripts"
+msgid "3~ Use example auto scripts"
msgstr "2~ Un ejemplo de scripts auto."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:20
msgid ""
-"Use auto script examples such as the following as the starting point for "
-"your new live-build configuration. Take note that when you call the #{lb}# "
-"command that the auto script wraps, you must specify #{noauto}# as its "
-"parameter to ensure that the auto script isn't called again, recursively. "
-"Also, don't forget to ensure the scripts are executable (e.g. #{chmod 755 "
-"auto/*}#)."
+"For your convenience, live-build comes with example auto shell scripts to "
+"copy and edit. Start a new, default configuration, then copy the examples "
+"into it:"
msgstr ""
-"Se debe utilizar scripts auto similares a los ejemplos que se muestran a "
-"continuación como punto de partida para una nueva configuración de la "
-"herramienta live-build. Hay que hacer notar que, cuando se ejecuta el "
-"comando #{lb}# dentro del script auto, se debe especificar la opción #"
-"{noauto}# para asegurar que el script auto no se vuelve a ejecutar "
-"repetitivamente. Tampoco se debe olvidar asegurarse de que los scripts auto "
-"sean ejecutables (por ejemplo #{chmod 755 auto/*}#). "
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:22
-msgid "#{auto/config}#"
-msgstr "#{auto/config}#"
+#: en/user_managing_a_configuration.ssi:25
+#, no-wrap
+msgid ""
+" $ mkdir mylive && cd mylive && lb config\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
+msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:29
+msgid "Edit #{auto/config}#, adding any options as you see fit. For instance:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:40
#, no-wrap
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --package-lists \"standard\" \\\n"
+" --architectures i386 \\\n"
+" --linux-flavours 686-pae \\\n"
+" --binary-images hdd \\\n"
+" --mirror-bootstrap http://ftp.es.debian.org/debian/ \\\n"
+" --mirror-binary http://ftp.es.debian.org/debian/ \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:33
-msgid "#{auto/clean}#"
-msgstr "#{auto/clean}#"
+#: en/user_managing_a_configuration.ssi:44
+msgid ""
+"Now, each time you use #{lb config}#, #{auto/config}# will reset the "
+"configuration based on these options. When you want to make changes to them, "
+"edit the options in this file instead of passing them to #{lb config}#. When "
+"you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files "
+"along with any other build products. And finally, when you use #{lb build}#, "
+"a log of the build will be written by #{auto/build}# in #{build.log}#."
+msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:41
-#, no-wrap
+#: en/user_managing_a_configuration.ssi:46
msgid ""
-" #!/bin/sh\n"
-" lb clean noauto \"${@}\"\n"
-" rm -f config/binary config/bootstrap \\\n"
-" config/chroot config/common config/source\n"
-" rm -f build.log\n"
+"Note: A special #{noauto}# parameter is used here to suppress another call "
+"to #{auto/config}#, thereby preventing infinite recursion. Make sure you "
+"don't accidentally remove it when making edits. Also, take care to ensure "
+"when you split the #{lb config}# command across multiple lines for "
+"readability, as shown in the example above, that you don't forget the "
+"backslash (\\) at the end of each line that continues to the next."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:45
-msgid "#{auto/build}#"
-msgstr "#{auto/build}#"
+#: en/user_managing_a_configuration.ssi:48
+msgid "2~ Clone a configuration published via Git"
+msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-#, no-wrap
msgid ""
-" #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
+"Use the #{lb config --config}# option to clone a Git repository that "
+"contains a Debian Live configuration. If you would like to base your "
+"configuration on one maintained by the Debian Live project, look at http://"
+"live.debian.net/gitweb for the repositories prefixed with #{config-}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:52
msgid ""
-"We now ship example auto scripts with live-build based on the examples "
-"above. You may copy those as your starting point."
+"For example, to build a rescue image, use the #{config-rescue}# repository "
+"as follows:"
msgstr ""
-"Estos scripts auto vienen de serie con las herramientas live-build. Bastaría "
-"con copiar estos scripts como punto de partida."
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:58
+#: en/user_managing_a_configuration.ssi:57
#, no-wrap
-msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
+msgid ""
+" $ mkdir live-rescue && cd live-rescue\n"
+" $ lb config git://live.debian.net/git/config-rescue.git\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:61
msgid ""
-"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
-"example above, #{--package-lists standard}# is set to the default value. "
-"Change this to an appropriate value for your image (or delete it if you want "
-"to use the default) and add any additional options in continuation lines "
-"that follow."
+"Edit #{auto/config}# and any other things you need in the #{config}# tree to "
+"suit your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:63
+msgid ""
+"You may optionally define a shortcut in your Git configuration by adding the "
+"following to your #{${HOME}/.gitconfig}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:68
+#, no-wrap
+msgid ""
+" [url \"git://live.debian.net/git/\"]\n"
+" insteadOf = ldn:\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:72
+msgid ""
+"This enables you to use #{ldn:}# anywhere you need to specify the address of "
+"a #{live.debian.net}# git repository. If you also drop the optional #{.git}# "
+"suffix, starting a new image using this configuration is as easy as:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:76
+#, no-wrap
+msgid " $ lb config ldn:config-rescue\n"
msgstr ""
-"Se puede editar el script #{auto/config}#, modificándolo o añadiendo "
-"cualquier opción que se acomode a las necesidades requeridas. En el ejemplo "
-"anterior, se asigna la opción por defecto #{--package-lists standard}#. Se "
-"puede cambiar este valor por uno adecuado o simplemente eliminarlo si no es "
-"necesario, añadiendo en las líneas siguientes cualquier otra opción que se "
-"adecue a las necesidades requeridas para la imagen a crear. "
diff --git a/manual/po/es/user_overview.ssi.po b/manual/po/es/user_overview.ssi.po
index 923cdd5..6323cfa 100644
--- a/manual/po/es/user_overview.ssi.po
+++ b/manual/po/es/user_overview.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-16 18:50+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2011-11-07 14:47+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -24,7 +24,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -41,51 +41,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -94,7 +95,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -111,56 +112,63 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
+msgstr " $ lb config --distribution sid\n"
+
+#. type: Plain text
#: en/user_overview.ssi:2
msgid ":B~ Overview of tools"
msgstr ":B~ Descripción general de las herramientas"
@@ -324,9 +332,9 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config\n"
-" [2012-03-19 15:17:14] lb_config\n"
+" [2012-08-03 22:59:17] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree for a debian system\n"
+" P: Creating config tree for a debian/i386 system\n"
msgstr ""
#. type: Plain text
@@ -344,20 +352,18 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:47
+#, fuzzy
+#| msgid ""
+#| "Normally, you will want to specify some options. For example, to include "
+#| "the 'gnome' package list in your configuration:"
msgid ""
-"Normally, you will want to specify some options. For example, to include the "
-"'gnome' package list in your configuration:"
+"Normally, you will want to specify some options. For example, to specify "
+"which distribution you want to build using its codename:"
msgstr ""
"Normalmente, se tendrá que especificar algunas opciones. Por ejemplo, para "
"incluir la lista del paquete 'gnome' en la configuración:"
#. type: Plain text
-#: en/user_overview.ssi:51
-#, no-wrap
-msgid " $ lb config -p gnome\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_overview.ssi:55
msgid "It is possible to specify many options, such as:"
msgstr "Es posible especificar muchas opciones, tales como:"
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 4a7f347..334d272 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-02 00:07+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\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"
@@ -50,10 +50,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-08-02\n"
+" :published: 2012-08-06\n"
msgstr ""
"@date:\n"
-" :published: 02.08.2012\n"
+" :published: 06.08.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index 33d7148..5038334 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-07-21 16:24+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -37,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -107,51 +108,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -168,11 +170,17 @@ msgstr "1~bugs Rapporter des bogues"
#. type: Plain text
#: en/project_bugs.ssi:6
+#, fuzzy
+#| msgid ""
+#| "Debian Live is far from being perfect, but we want to make it as close as "
+#| "possible to perfect - with your help. Do not hesitate to report a bug: it "
+#| "is better to fill a report twice than never. However, this chapter "
+#| "includes recommendations how to file good bug reports."
msgid ""
"Debian Live is far from being perfect, but we want to make it as close as "
-"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"possible to perfect - with your help. Do not hesitate to report a bug. It is "
"better to fill a report twice than never. However, this chapter includes "
-"recommendations how to file good bug reports."
+"recommendations on how to file good bug reports."
msgstr ""
"Debian Live est loin d'être parfait, mais nous voulons le rendre aussi "
"proche que possible de parfait - avec votre aide. N'hésitez pas à signaler "
@@ -224,10 +232,15 @@ msgstr "2~ Problèmes connus"
#. type: Plain text
#: en/project_bugs.ssi:18
+#, fuzzy
+#| msgid ""
+#| "Because Debian *{testing}* and Debian *{unstable}* distributions are a "
+#| "moving target, when you specify either as the target system distribution, "
+#| "a successful build may not always be possible."
msgid ""
-"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
-"moving target, when you specify either as the target system distribution, a "
-"successful build may not always be possible."
+"Since Debian *{testing}* and Debian *{unstable}* distributions are moving "
+"targets, when you specify either of them as the target system distribution, "
+"a successful build may not always be possible."
msgstr ""
"Parce que les distributions Debian *{testing}* et Debian *{unstable}* sont "
"une cible mouvante, quand vous les spécifiez comme les distributions du "
@@ -240,10 +253,15 @@ msgstr "% FIXME:"
#. type: Plain text
#: en/project_bugs.ssi:22
+#, fuzzy
+#| msgid ""
+#| "If this causes too much difficulty for you, do not build a system based "
+#| "on *{testing}* or *{unstable}*, but rather, use *{stable}*. live-build "
+#| "does always default to the *{stable}* release."
msgid ""
"If this causes too much difficulty for you, do not build a system based on *"
-"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
-"always default to the *{stable}* release."
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always "
+"defaults to the *{stable}* release."
msgstr ""
"Si cela provoque trop de difficulté pour vous, ne pas construire un système "
"basé sur *{testing}* or *{unstable}*, mais plutôt utiliser *{stable}*. live-"
@@ -316,10 +334,16 @@ msgstr "2~collect-information Recueillir l'information"
#. type: Plain text
#: en/project_bugs.ssi:38
-msgid ""
-"Please provide enough information with your report. At least include the "
-"exact version of live-build version where the bug is encountered and steps "
-"to reproduce it. Please use common sense and include other relevant "
+#, fuzzy
+#| msgid ""
+#| "Please provide enough information with your report. At least include the "
+#| "exact version of live-build version where the bug is encountered and "
+#| "steps to reproduce it. Please use common sense and include other relevant "
+#| "information if you think that it might help in solving the problem."
+msgid ""
+"Please provide enough information with your report. Include, at least, the "
+"exact version of live-build where the bug is encountered and the steps to "
+"reproduce it. Please use your common sense and provide any other relevant "
"information if you think that it might help in solving the problem."
msgstr ""
"S'il vous plaît fournir assez d'informations à votre rapport. Incluez au "
@@ -386,9 +410,14 @@ msgstr "_* Version du noyau sur le système live"
#. type: Plain text
#: en/project_bugs.ssi:60
+#, fuzzy
+#| msgid ""
+#| "You can generate a log of the build process by using the #{tee}# command. "
+#| "We recommend doing this automatically with an #{auto/build}# script; (see "
+#| "{Managing a configuration}#managing-a-configuration for details)."
msgid ""
"You can generate a log of the build process by using the #{tee}# command. We "
-"recommend doing this automatically with an #{auto/build}# script; (see "
+"recommend doing this automatically with an #{auto/build}# script (see "
"{Managing a configuration}#managing-a-configuration for details)."
msgstr ""
"Vous pouvez générer un journal du processus de construction en utilisant la "
@@ -397,8 +426,8 @@ msgstr ""
"configuration pour les détails)."
#. type: Plain text
-#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr " # lb build 2>&1 | tee build.log\n"
@@ -447,11 +476,22 @@ msgstr "2~ Isoler le cas qui échoue, si possible"
#. type: Plain text
#: en/project_bugs.ssi:76
+#, fuzzy
+#| msgid ""
+#| "If possible, isolate the failing case to the smallest possible change "
+#| "that breaks. It is not always easy to do this, so if you can't manage it "
+#| "for your report, don't worry. However, if you plan your development cycle "
+#| "well, using small enough change sets per iteration, you may be able to "
+#| "isolate the problem by constructing a simpler 'base' configuration that "
+#| "closely matches your actual configuration plus just the broken change set "
+#| "added to it. If you have a hard time sorting out which of your changes "
+#| "broke, it may be that you are including too much in each change set and "
+#| "should develop in smaller increments."
msgid ""
"If possible, isolate the failing case to the smallest possible change that "
-"breaks. It is not always easy to do this, so if you can't manage it for your "
-"report, don't worry. However, if you plan your development cycle well, using "
-"small enough change sets per iteration, you may be able to isolate the "
+"breaks. It is not always easy to do this so if you cannot manage it for your "
+"report, do not worry. However, if you plan your development cycle well, "
+"using small enough change sets per iteration, you may be able to isolate the "
"problem by constructing a simpler 'base' configuration that closely matches "
"your actual configuration plus just the broken change set added to it. If "
"you have a hard time sorting out which of your changes broke, it may be that "
@@ -476,10 +516,15 @@ msgstr "2~ Utilisez le paquet adéquat pour rapporter le bogue"
#. type: Plain text
#: en/project_bugs.ssi:80
+#, fuzzy
+#| msgid ""
+#| "If you don't know what component is responsible for the bug or if the bug "
+#| "is a general bug concerning live systems, you can fill a bug against the "
+#| "debian-live pseudo-package."
msgid ""
-"If you don't know what component is responsible for the bug or if the bug is "
-"a general bug concerning live systems, you can fill a bug against the debian-"
-"live pseudo-package."
+"If you do not know what component is responsible for the bug or if the bug "
+"is a general bug concerning live systems, you can fill a bug against the "
+"debian-live pseudo-package."
msgstr ""
"Si vous ne savez pas quel composant est responsable du bogue ou si le bogue "
"est un bogue général concernant les systèmes live, vous pouvez remplir un "
@@ -487,9 +532,13 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:82
+#, fuzzy
+#| msgid ""
+#| "However, we would appreciate if you try to narrow it down according to "
+#| "where the bug appears."
msgid ""
-"However, we would appreciate if you try to narrow it down according to where "
-"the bug appears."
+"However, we would appreciate it if you try to narrow it down according to "
+"where the bug appears."
msgstr ""
"Toutefois, nous apprécierons si vous essayez de le réduire en fonction de "
"l'endroit où le bogue apparaît."
@@ -501,12 +550,19 @@ msgstr "3~ Au moment de la construction tandis l'amorçage"
#. type: Plain text
#: en/project_bugs.ssi:86
+#, fuzzy
+#| msgid ""
+#| "live-build first bootstraps a basic Debian system with /{debootstrap}/ "
+#| "or /{cdebootstrap}/. Depending on the bootstrapping tool used and the "
+#| "Debian distribution it is bootstrapping, it may fail. If a bug appears "
+#| "here, check if the error is related to a specific Debian package (most "
+#| "likely), or if it is related to bootstrapping tool itself."
msgid ""
"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
-"is related to bootstrapping tool itself."
+"is related to the bootstrapping tool itself."
msgstr ""
"live-build amorce d'abord un système Debian de base avec /{debootstrap}/ ou /"
"{cdebootstrap}/. Selon l'outil d'amorçage utilisé et de la distribution "
@@ -516,9 +572,14 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:88
+#, fuzzy
+#| msgid ""
+#| "In both cases, this is not a bug in Debian Live, but rather in Debian "
+#| "itself which we can not fix this directly. Please report such a bug "
+#| "against the bootstrapping tool or the failing package."
msgid ""
"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
-"which we can not fix this directly. Please report such a bug against the "
+"and probably we cannot fix it directly. Please report such a bug against the "
"bootstrapping tool or the failing package."
msgstr ""
"Dans les deux cas, ce n'est pas un bogue dans Debian Live, mais plutôt dans "
@@ -558,10 +619,15 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:96
+#, fuzzy
+#| msgid ""
+#| "Also, if you are using a local mirror and/or any of sort of proxy and you "
+#| "are experiencing a problem, please always reproduce it first by "
+#| "bootstrapping from an official mirror."
msgid ""
-"Also, if you are using a local mirror and/or any of sort of proxy and you "
-"are experiencing a problem, please always reproduce it first by "
-"bootstrapping from an official mirror."
+"Also, if you are using a local mirror and/or any sort of proxy and you are "
+"experiencing a problem, please always reproduce it first by bootstrapping "
+"from an official mirror."
msgstr ""
"Aussi, si vous utilisez un miroir local et/ou un proxy et vous rencontrez un "
"problème, s'il vous plaît toujours le reproduire d'abord bootstrapping sur "
@@ -574,13 +640,22 @@ msgstr "3~ Au moment du démarrage"
#. type: Plain text
#: en/project_bugs.ssi:100
+#, fuzzy
+#| msgid ""
+#| "If your image does not boot, please report it to the mailing list "
+#| "together with the information requested in {Collect information}#collect-"
+#| "information. Do not forget to mention, how/when the image failed, in "
+#| "Qemu, Virtualbox, VMWare or real hardware. If you are using a "
+#| "virtualization technology of any kind, please always run it on real "
+#| "hardware before reporting a bug. Providing a screenshot of the failure is "
+#| "also very helpful."
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
-"VMWare or real hardware. If you are using a virtualization technology of any "
-"kind, please always run it on real hardware before reporting a bug. "
-"Providing a screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, whether in Qemu, "
+"Virtualbox, VMWare or real hardware. If you are using a virtualization "
+"technology of any kind, please always run it on real hardware before "
+"reporting a bug. Providing a screenshot of the failure is also very helpful."
msgstr ""
"Si votre image ne démarre pas, s'il vous plaît le signaler à la liste de "
"diffusion avec les informations demandées dans {Recueillir l'information}"
@@ -597,9 +672,13 @@ msgstr "3~ Au moment de l'exécution"
#. type: Plain text
#: en/project_bugs.ssi:104
+#, fuzzy
+#| msgid ""
+#| "If a package was successfully installed, but fails while actually running "
+#| "the Live system, this is probably a bug in Debian Live. However,"
msgid ""
"If a package was successfully installed, but fails while actually running "
-"the Live system, this is probably a bug in Debian Live. However,"
+"the Live system, this is probably a bug in Debian Live. However:"
msgstr ""
"Si un paquet a été installé avec succès, mais échoue tout en exécutant le "
"système Live, c'est probablement un bogue dans Debian Live. Cependant,"
@@ -611,11 +690,18 @@ msgstr "2~ Faire les recherches"
#. type: Plain text
#: en/project_bugs.ssi:108
+#, fuzzy
+#| msgid ""
+#| "Before filing the bug, please search the web for the particular error "
+#| "message or symptom you are getting. As it is highly unlikely that you are "
+#| "the only person experiencing a particular problem, there is always a "
+#| "chance that it has been discussed elsewhere, and a possible solution, "
+#| "patch, or workaround has been proposed."
msgid ""
"Before filing the bug, please search the web for the particular error "
"message or symptom you are getting. As it is highly unlikely that you are "
-"the only person experiencing a particular problem, there is always a chance "
-"that it has been discussed elsewhere, and a possible solution, patch, or "
+"the only person experiencing a particular problem. There is always a chance "
+"that it has been discussed elsewhere and a possible solution, patch, or "
"workaround has been proposed."
msgstr ""
"Avant de présenter le bogue, s'il vous plaît recherchez sur le web le "
@@ -640,10 +726,15 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:112
+#, fuzzy
+#| msgid ""
+#| "In addition, you should check the current bug lists for live-build, live-"
+#| "boot, live-config and live-tools to see whether something similar has "
+#| "been reported already."
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, live-config and live-tools to see whether something similar has been "
-"reported already."
+"boot, live-config and live-tools to see whether something similar has "
+"already been reported."
msgstr ""
"En outre, vous devriez vérifier les listes de bogues en cours de live-build, "
"live-boot, live-config et live-tools pour voir si quelque chose de "
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index e51d61f..0b18635 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-04-28 16:09+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -20,8 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -38,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -91,8 +91,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -109,51 +108,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -193,12 +193,19 @@ msgstr "2~includes Includes"
#. type: Plain text
#: en/user_customization-contents.ssi:10
+#, fuzzy
+#| msgid ""
+#| "While ideally a Debian live system would include files entirely provided "
+#| "by unmodified Debian packages, it is sometimes convenient to provide or "
+#| "modify some content by means of files. Using includes, it is possible to "
+#| "add (or replace) arbitrary files in your Debian Live image. live-build "
+#| "provides three mechanisms for using them:"
msgid ""
"While ideally a Debian live system would include files entirely provided by "
"unmodified Debian packages, it is sometimes convenient to provide or modify "
"some content by means of files. Using includes, it is possible to add (or "
-"replace) arbitrary files in your Debian Live image. live-build provides "
-"three mechanisms for using them:"
+"replace) arbitrary files in your Debian Live image. live-build provides two "
+"mechanisms for using them:"
msgstr ""
"Bien qu'idéalement un système Debian Live comprendrait des fichiers "
"entièrement fournis par les paquets Debian non modifiés, on convient parfois "
@@ -232,18 +239,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:16
msgid ""
-"_* Binary includes: These allow you to add or replace Debian specific files "
-"in the binary image, such as the templates and tools directories. Please see "
-"{Binary includes}#binary-includes for more information."
-msgstr ""
-"_* Binary includes: Ils vous permettent d'ajouter ou remplacer des fichiers "
-"spécifiques de Debian dans l'image binaire, comme des modèles et des "
-"répertoires d'outils. S'il vous plaît voir {Binary includes}#binary-includes "
-"pour plus d'informations."
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid ""
"Please see {Terms}#terms for more information about the distinction between "
"the \"Live\" and \"binary\" images."
msgstr ""
@@ -251,12 +246,12 @@ msgstr ""
"distinction entre les images \"Live\" et \"binary\"."
#. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:18
msgid "3~live-chroot-local-includes Live/chroot local includes"
msgstr "3~live-chroot-local-includes Live/chroot local includes"
#. type: Plain text
-#: en/user_customization-contents.ssi:22
+#: en/user_customization-contents.ssi:20
msgid ""
"Chroot local includes can be used to add or replace files in the chroot/Live "
"filesystem so that they may be used in the Live system. A typical use is to "
@@ -276,7 +271,7 @@ msgstr ""
"hooks}#live-chroot-local-hooks si le traitement est nécessaire."
#. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:22
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory #{/}# of the "
@@ -289,7 +284,7 @@ msgstr ""
"html}# dans le système live, utilisez:"
#. type: Plain text
-#: en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:27
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/var/www\n"
@@ -297,12 +292,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:33
+#: en/user_customization-contents.ssi:31
msgid "Your configuration will then have the following layout:"
msgstr "Votre configuration aura alors le schéma suivant:"
#. type: Plain text
-#: en/user_customization-contents.ssi:44
+#: en/user_customization-contents.ssi:42
#, no-wrap
msgid ""
" -- config\n"
@@ -316,7 +311,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:48
+#: en/user_customization-contents.ssi:46
msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
@@ -325,12 +320,12 @@ msgstr ""
"sorte que les fichiers installés par les paquets sont remplacés."
#. type: Plain text
-#: en/user_customization-contents.ssi:50
+#: en/user_customization-contents.ssi:48
msgid "3~binary-local-includes Binary local includes"
msgstr "3~binary-local-includes Binary local includes"
#. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: en/user_customization-contents.ssi:50
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 "
@@ -350,57 +345,25 @@ msgstr ""
"comme suit:"
#. type: Plain text
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:54
#, no-wrap
msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:58
msgid "These files will now appear in the root directory of the live media."
msgstr ""
"Ces fichiers apparaissent maintenant dans le répertoire racine du support "
"live."
#. type: Plain text
-#: en/user_customization-contents.ssi:62
-msgid "3~binary-includes Binary includes"
-msgstr "3~binary-includes Binary includes"
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:64
-msgid ""
-"live-build has some standard files (like documentation) that gets included "
-"in the default configuration on every live media. This can be disabled with:"
-msgstr ""
-"live-build a certains fichiers standard (comme la documentation) qui seront "
-"inclus dans la configuration par défaut sur tous les supports live. Ceci "
-"peut être désactivé avec:"
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:68
-#, no-wrap
-msgid " $ lb config --includes none\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:72
-msgid ""
-"Otherwise, the material will be installed by live-build in #{/includes/}# by "
-"default on the media filesystem, or else you can specify an alternate path "
-"with #{--includes}#."
-msgstr ""
-"Sinon, le matériel sera installé par live-build dans #{/includes/}# par "
-"défaut sur le système de fichiers du support, ou bien vous pouvez spécifier "
-"un autre chemin d'accès avec #{--includes}#."
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:74
+#: en/user_customization-contents.ssi:60
msgid "2~hooks Hooks"
msgstr "2~hooks Hooks"
#. type: Plain text
-#: en/user_customization-contents.ssi:76
+#: en/user_customization-contents.ssi:62
msgid ""
"Hooks allow commands to be performed in the chroot and binary stages of the "
"build in order to customize the image."
@@ -409,12 +372,12 @@ msgstr ""
"construction chroot et binary afin de personnaliser l'image. "
#. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:64
msgid "3~live-chroot-local-hooks Live/chroot local hooks"
msgstr "3~live-chroot-local-hooks Live/chroot local hooks"
#. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:66
msgid ""
"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -436,12 +399,12 @@ msgstr ""
"utiliser dans votre propre configuration."
#. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:68
msgid "3~boot-time-hooks Boot-time hooks"
msgstr "3~boot-time-hooks Hooks au moment du démarrage"
#. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:70
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-"
@@ -461,12 +424,12 @@ msgstr ""
"tiers}#installing-modified-or-third-party-packages."
#. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:72
msgid "3~ Binary local hooks"
msgstr "3~ Binary local hooks"
#. type: Plain text
-#: en/user_customization-contents.ssi:88
+#: en/user_customization-contents.ssi:74
msgid ""
"To run commands in the binary stage, create a hook script with a #{.binary}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -491,12 +454,12 @@ msgstr ""
"propre configuration."
#. type: Plain text
-#: en/user_customization-contents.ssi:90
+#: en/user_customization-contents.ssi:76
msgid "2~ Preseeding Debconf questions"
msgstr "2~ Préconfigurer questions de debconf"
#. type: Plain text
-#: en/user_customization-contents.ssi:92
+#: en/user_customization-contents.ssi:78
msgid ""
"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
@@ -509,7 +472,7 @@ msgstr ""
"build en utilisant #{debconf-set-selections}#."
#. type: Plain text
-#: en/user_customization-contents.ssi:93
+#: en/user_customization-contents.ssi:79
msgid ""
"For more information about debconf, please see #{debconf(7)}# in the /"
"{debconf}/ package."
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 027908e..6e44cde 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-01 23:16+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-08-01 23:50+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -36,9 +36,8 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -66,22 +65,23 @@ msgstr ""
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -107,9 +107,8 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -137,22 +136,23 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -241,7 +241,7 @@ msgstr ""
"soutenue. Par exemple, pour construire contre *{unstable}*, sid, précisez: "
#. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config --distribution sid\n"
msgstr " $ lb config --distribution sid\n"
@@ -687,8 +687,10 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:138
-msgid "3~ Generated package lists"
-msgstr "3~ Listes de paquets générés"
+#, fuzzy
+#| msgid "3~package-lists Package lists"
+msgid "3~generated-package-lists Generated package lists"
+msgstr "3~package-lists Listes de paquets"
#. type: Plain text
#: en/user_customization-packages.ssi:140
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 54cf444..8225a24 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-07-09 13:50+0200\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -25,7 +25,7 @@ msgstr ":B~ Exemples"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -42,51 +42,52 @@ msgstr ":B~ Exemples"
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -95,7 +96,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -112,77 +113,78 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr " # lb build 2>&1 | tee build.log\n"
#. type: Plain text
-#: en/user_basics.ssi:34 en/user_examples.ssi:109
+#: en/user_basics.ssi:34 en/user_examples.ssi:107
#, no-wrap
msgid " $ lb config\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:127 en/user_examples.ssi:219
+#: en/user_examples.ssi:125 en/user_examples.ssi:217
#, no-wrap
msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:94
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -353,17 +355,21 @@ msgstr ""
"Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:59
-#, no-wrap
+#: en/user_examples.ssi:58
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ lb config\n"
+#| " $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
msgid ""
" $ mkdir tutorial2\n"
" $ cd tutorial2\n"
-" $ lb config -p lxde\n"
-" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-lxde-desktop iceweasel\" >> config/package-lists/my.list.chroot\n"
msgstr ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:63
+#: en/user_examples.ssi:62
msgid ""
"Our choice of LXDE for this example reflects our desire to provide a minimal "
"desktop environment, since the focus of the image is the single use we have "
@@ -381,7 +387,7 @@ msgstr ""
"contenu web, mais nous laissons cela comme un exercice pour le lecteur."
#. type: Plain text
-#: en/user_examples.ssi:65
+#: en/user_examples.ssi:64
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
@@ -390,25 +396,25 @@ msgstr ""
"journal comme dans {Tutoriel 1}#tutorial-1:"
#. type: Plain text
-#: en/user_examples.ssi:73
+#: en/user_examples.ssi:72
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
"Encore une fois, vérifiez que l'image est OK et faire un test, comme dans "
"{Tutoriel 1}#tutorial-1:"
#. type: Plain text
-#: en/user_examples.ssi:75
+#: en/user_examples.ssi:74
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr "2~tutorial-3 Tutoriel 3: Une image personnalisée"
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:76
#, no-wrap
msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr "*{Cas d'utilisation:}* Créer un projet pour construire une image personnalisée, contenant vos logiciels préférés à emporter avec vous sur une clé USB où que vous alliez, et évoluant dans des révisions successives selon vos besoins et vos préférences changent.\n"
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:78
msgid ""
"Since we will be changing our personalized image over a number of revisions, "
"and we want to track those changes, trying things experimentally and "
@@ -426,12 +432,12 @@ msgstr ""
"dans {Gestion d'une configuration}#managing-a-configuration."
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:80
msgid "3~ First revision"
msgstr "3~ Première révision"
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:86
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -440,23 +446,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:91
+#: en/user_examples.ssi:90
msgid "Edit #{auto/config}# to read as follows:"
msgstr "Éditer #{auto/config}# pour lire comme suit: "
#. type: Plain text
-#: en/user_examples.ssi:101
+#: en/user_examples.ssi:99
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
-" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:105
+#: en/user_examples.ssi:103
msgid ""
"Perform #{lb config}# to generate the config tree, using the #{auto/config}# "
"script you just created:"
@@ -465,24 +470,37 @@ msgstr ""
"le script #{auto/config}# que vous avez crée:"
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:111
msgid "Now populate your local package list:"
msgstr "Maintenant remplir votre liste de paquets locaux:"
#. type: Plain text
-#: en/user_examples.ssi:117
-#, no-wrap
-msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+#: en/user_examples.ssi:115
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ lb config\n"
+#| " $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
+msgid " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:119
+#, fuzzy
+#| msgid ""
+#| "First, #{--architectures 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}/."
msgid ""
"First, #{--architectures 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 "
+"much older systems. Third, we have chosen the /{lxde}/ task metapackage to "
+"give us a minimal desktop. And finally, we have added two initial favourite "
"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
"Tout d'abord, #{--architectures i386}# assure que sur notre système de "
@@ -495,12 +513,12 @@ msgstr ""
"{xchat}/."
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:121
msgid "Now, build the image:"
msgstr "Maintenant, construire l'image:"
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:129
msgid ""
"Note that unlike in the first two tutorials, we no longer have to type #"
"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
@@ -510,7 +528,7 @@ msgstr ""
"inclus dans #{auto/build}#."
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:131
msgid ""
"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
"satisfied it works, it's time to initialize our #{git}# repository, adding "
@@ -522,7 +540,7 @@ msgstr ""
"créé, et ensuite faire le premier commit: "
#. type: Plain text
-#: en/user_examples.ssi:139
+#: en/user_examples.ssi:137
#, no-wrap
msgid ""
" $ git init\n"
@@ -531,12 +549,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:141
msgid "3~ Second revision"
msgstr "3~ Deuxième révision"
#. type: Plain text
-#: en/user_examples.ssi:145
+#: en/user_examples.ssi:143
msgid ""
"In this revision, we're going to clean up from the first build, add the /"
"{vlc}/ package to our configuration, rebuild, test and commit."
@@ -546,7 +564,7 @@ msgstr ""
"tester et faire le commit."
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:145
msgid ""
"The #{lb clean}# command will clean up all generated files from the previous "
"build except for the cache, which saves having to re-download packages. This "
@@ -560,13 +578,13 @@ msgstr ""
"configuration."
#. type: Plain text
-#: en/user_examples.ssi:151
+#: en/user_examples.ssi:149
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:153
msgid ""
"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
@@ -575,34 +593,34 @@ msgstr ""
"{config/package-lists/my.list.chroot}#:"
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:157
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:161
msgid "Build again:"
msgstr "Construire à nouveau:"
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:165
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:169
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr "Tester, et quand vous soyez satisfaits, commit la prochaine révision:"
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:173
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:179
+#: en/user_examples.ssi:177
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -620,7 +638,7 @@ msgstr ""
"config}# via leur respectives #{auto}# scripts."
#. type: Plain text
-#: en/user_examples.ssi:181
+#: en/user_examples.ssi:179
msgid ""
"We've come to the end of our tutorial series. While many more kinds of "
"customization are possible, even just using the few features explored in "
@@ -636,51 +654,56 @@ msgstr ""
"expériences recueillies des utilisateurs de Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:183
+#: en/user_examples.ssi:181
msgid "2~ A VNC Kiosk Client"
msgstr "2~ Un client Kiosk VNC "
#. type: Plain text
-#: en/user_examples.ssi:185
+#: en/user_examples.ssi:183
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr "*{Cas d'utilisation:}* Créer une image avec live-build pour démarrer directement à un serveur VNC.\n"
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:185
msgid ""
-"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
-"{xvnc4viewer}/, disabling recommends to make a minimal system:"
+"Make a build directory and create an skeletal configuration inside it, "
+"disabling recommends to make a minimal system. And then create two package "
+"lists: the first one generated with a script provided by live-build named #"
+"{Packages}# (see {Generated package lists}#generated-package-lists), and the "
+"second one including /{xorg}/, /{gdm3}/, /{metacity}/ and /{xvnc4viewer}/."
msgstr ""
-"Faire un répertoire de construction et créer une arborescence de fichiers "
-"construite autour de la liste standard x11, avec /{gdm3}/, /{metacity}/ et /"
-"{xvnc4viewer}/, désactivant «recommends» pour faire un système minimal:"
#. type: Plain text
-#: en/user_examples.ssi:195
+#: en/user_examples.ssi:193
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\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"
+" $ lb config -a i386 -k 686-pae --apt-recommends false\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo \"xorg gdm3 metacity xvnc4viewer\" > config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
+#: en/user_examples.ssi:197
+#, fuzzy
+#| msgid ""
+#| "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it "
+#| "for the default user that will launch /{metacity}/ and start /"
+#| "{xvncviewer}/, connecting to port #{5901}# on a server at #{192.168.1.2}#:"
msgid ""
-"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
-"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
+"Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a "
+"custom #{.xsession}# in it for the default user that will launch /"
+"{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a "
+"server at #{192.168.1.2}#:"
msgstr ""
"Créez le répertoire #{/etc/skel}# avec une #{.xsession}# personnalisée pour "
"l'utilisateur par défaut qui va lancer /{metacity}/ et commencer /"
"{xvncviewer}/, en reliant le port #{5901}# sur un serveur à #{192.168.1.2}#:"
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -689,7 +712,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:206
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -697,7 +720,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:209
#, no-wrap
msgid ""
" exit\n"
@@ -705,38 +728,50 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:213
msgid "Build the image:"
msgstr "Construire l'image:"
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:221
msgid "Enjoy."
msgstr "Amusez-vous bien!"
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:223
msgid "2~ A base image for a 128M USB key"
msgstr "2~ Une image de base pour une clé USB de 128M"
#. type: Plain text
-#: en/user_examples.ssi:227
-#, no-wrap
-msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+#: en/user_examples.ssi:225
+#, fuzzy, no-wrap
+#| msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.\n"
msgstr "*{Cas d'utilisation:}* Créer une image standard avec certains composants éliminés afin de l'adapter sur une clé USB de 128M avec espace laissé pour l'utiliser à votre convenance.\n"
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:227
+#, fuzzy
+#| msgid ""
+#| "When optimizing an image to fit a certain media size, you need to "
+#| "understand the tradeoffs you are making between size and functionality. "
+#| "In this example, we trim only so much as to make room for additional "
+#| "material within a 128M media size, but without doing anything to destroy "
+#| "integrity of the packages contained within, such as the purging of locale "
+#| "data via the /{localepurge}/ package, or other such \"intrusive\" "
+#| "optimizations. Of particular note, you should not use #{--bootstrap-"
+#| "flavour minimal}# unless you really know what you're doing, as omitting "
+#| "priority *{important}* packages will most likely produce a broken live "
+#| "system."
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
-"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the /"
+"a 128M media size, but without doing anything to destroy the integrity of "
+"the packages contained within, such as the purging of locale data via the /"
"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
-"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority *{important}* "
-"packages will most likely produce a broken live system."
+"particular note, in order to understand what the #{minimal.chroot}# hook "
+"does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#"
msgstr ""
"Pour l'optimisation d'une image adaptée à la dimension des certains "
"supports, vous avez besoin de comprendre le compromis que vous faites entre "
@@ -750,24 +785,29 @@ msgstr ""
"de priorité *{importante}* produira probablement un système live cassé."
#. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:232
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --apt-indices false \\\n"
-" --memtest none --apt-recommends false --includes none\n"
+" $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none\n"
+" $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:236
msgid "Now, build the image in the usual way:"
msgstr "Maintenant, construire l'image de la manière habituelle:"
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:244
+#, fuzzy
+#| msgid ""
+#| "On the author's system at time of writing, the above configuration "
+#| "produced a 78Mbyte image. This compares favourably with the 166Mbyte "
+#| "image produced by the default configuration in {Tutorial 1}#tutorial-1."
msgid ""
-"On the author's system at time of writing, the above configuration produced "
-"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
-"by the default configuration in {Tutorial 1}#tutorial-1."
+"On the author's system at the time of writing this, the above configuration "
+"produced a 95Mbyte image. This compares favourably with the 182Mbyte image "
+"produced by the default configuration in {Tutorial 1}#tutorial-1."
msgstr ""
"Sur le système de l'auteur au moment de l'écriture, la configuration ci-"
"dessus produisait une image de 78Mbyte. Cela se compare favorablement avec "
@@ -775,21 +815,34 @@ msgstr ""
"1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:246
+#, 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-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."
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-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."
+"system. 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. #{--memtest none}# prevents the "
+"installation of a memory tester. And finally, the execution of the #{minimal}"
+"# hook removes some unused packages and files."
msgstr ""
"Le plus grand espace-économiseur ici, par rapport à la construction d'une "
"image standard sur une architecture #{i386}#, est de sélectionner uniquement "
@@ -808,6 +861,16 @@ msgstr ""
"perte de fonctionnalité."
#. type: Plain text
+#: en/user_examples.ssi:248
+msgid ""
+"Using other hooks, like for example the #{stripped.chroot}# hook found in #{/"
+"usr/share/doc/live-build/examples/hooks}#, may shave off additional small "
+"amounts of space and produce an image of 76MB. But it is up to you to decide "
+"if the functionality that is sacrificed with each size optimization is worth "
+"the loss of functionality."
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:250
msgid "2~ A localized KDE desktop and installer"
msgstr "2~ Un bureau KDE localisé et installateur "
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index e6d7934..6c228fd 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-03-19 21:02+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -37,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -90,7 +91,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -107,51 +108,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -185,63 +187,62 @@ msgstr "2~ Utiliser auto pour gérer les modifications de configuration"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
msgid ""
-"Live configurations rarely are perfect on the first try. You'll likely need "
-"to make a series of revisions until you are satisfied. However, "
-"inconsistencies can creep into your configuration from one revision to the "
-"next if you aren't careful. The main problem is, once a variable is given a "
-"default value, that value will not be recomputed from other variables that "
-"may change in later revisions."
+"Live configurations rarely are perfect on the first try. It may be fine to "
+"pass #{lb config}# options from the command-line to perform a single build, "
+"but it is more typical to revise those options and build again until you are "
+"satisfied. To support these changes, you will need auto scripts which ensure "
+"your configuration is kept in a consistent state."
msgstr ""
-"Les configurations live sont rarement parfaites du premier coup. Vous aurez "
-"probablement besoin de faire une série de révisions jusqu'à ce que vous êtes "
-"satisfait. Cependant, des incohérences peuvent se glisser dans votre "
-"configuration d'une révision à la prochaine si vous ne faites pas attention. "
-"Le principal problème est, une fois qu'une variable est donnée une valeur "
-"par défaut, cette valeur ne sera pas recalculée à partir d'autres variables "
-"qui peuvent changer dans les révisions ultérieures."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
-msgid ""
-"For example, when the distribution is first set, many 'dependent' variables "
-"are given default values that suit that distribution. However, if you later "
-"decide to change the distribution, those dependent variables continue to "
-"retain old values that are no longer appropriate."
+msgid "3~ Why you need auto"
msgstr ""
-"Par exemple, lorsque la distribution est d'abord définie, nombreuses "
-"variables sont assignées des valeurs par défaut qui conviennent à cette "
-"distribution. Cependant, si vous décidez ultérieurement de modifier la "
-"distribution, ces variables dépendantes conservent les anciennes valeurs qui "
-"ne sont plus appropriées."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:14
msgid ""
-"A second, related problem is that if you run #{lb config}# and then upgrade "
-"to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your #"
-"{config/*}# files, which you will then need to use to set the appropriate "
-"option again."
+"The #{lb config}# command stores the options you pass to it in #{config/*}# "
+"files along with many other options set to default values. If you run #{lb "
+"config}# again, it will not reset any option that was defaulted based on "
+"your initial options. So, for example, if you run #{lb config}# again with a "
+"new value for #{--distribution}#, any dependent options that were defaulted "
+"for the old distribution may no longer work with the new. Nor are these "
+"files intended to be read or edited. They store values for over a hundred "
+"options, so nobody, let alone yourself, will be able to see in these which "
+"options you actually specified. And finally, if you run #{lb config}#, then "
+"upgrade live-build and it happens to rename an option, #{config/*}# would "
+"still contain variables named after the old option that are no longer valid."
msgstr ""
-"Un deuxième problème lié est que si vous exécutez #{lb config}# et ensuite "
-"mettez à jour une nouvelle version de live-build qui a changée l'un des noms "
-"des variables, vous découvrirez ce que par un examen manuel des variables "
-"dans votre fichiers dans #{config/*}#, que vous devrez ensuite utiliser pour "
-"définir l'option appropriée à nouveau."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:16
+#, fuzzy
+#| msgid ""
+#| "All of this would be a terrible nuisance if it weren't for auto/* "
+#| "scripts, simple wrappers to the #{lb config}#, #{lb build}# and #{lb "
+#| "clean}# commands that are designed to help you manage your configuration. "
+#| "Simply create an auto/config script containing #{lb config}# command with "
+#| "all desired options, and an auto/clean that removes the files containing "
+#| "configuration variable values, and each time you run #{lb config}# and #"
+#| "{lb clean}#, these files will be executed. This will ensure that your "
+#| "configuration is kept internally consistent from one revision to the next "
+#| "and from one live-build release to the next (Although you will still have "
+#| "to take care and read the documentation when you upgrade live-build and "
+#| "make adjustments as needed)."
msgid ""
-"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
-"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
-"that are designed to help you manage your configuration. Simply create an "
-"auto/config script containing #{lb config}# command with all desired "
-"options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
-"files will be executed. This will ensure that your configuration is kept "
-"internally consistent from one revision to the next and from one live-build "
-"release to the next (Although you will still have to take care and read the "
-"documentation when you upgrade live-build and make adjustments as needed)."
+"For all these reasons, #{auto/*}# scripts will make your life easier. They "
+"are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# "
+"commands that are designed to help you manage your configuration. The #{auto/"
+"config}# script stores your #{lb config}# command with all desired options, "
+"the #{auto/clean}# script removes the files containing configuration "
+"variable values, and the #{auto/build}# script keeps a #{build.log}# of each "
+"build. Each of these scripts is run automatically every time you run the "
+"corresponding #{lb}# command. By using these scripts, your configuration is "
+"easier to read and is kept internally consistent from one revision to the "
+"next. Also, it will be much easier for you identify and fix options which "
+"need to change when you upgrade live-build after reading the updated "
+"documentation."
msgstr ""
"Tout cela serait une nuisance terrible si ce n'était pas pour les scripts "
"auto/*, simples emballages pour les commandes #{lb config}#, #{lb build}# et "
@@ -257,97 +258,129 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
-msgid "2~ Example auto scripts"
+#, fuzzy
+#| msgid "2~ Example auto scripts"
+msgid "3~ Use example auto scripts"
msgstr "2~ Exemples de scripts auto"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:20
msgid ""
-"Use auto script examples such as the following as the starting point for "
-"your new live-build configuration. Take note that when you call the #{lb}# "
-"command that the auto script wraps, you must specify #{noauto}# as its "
-"parameter to ensure that the auto script isn't called again, recursively. "
-"Also, don't forget to ensure the scripts are executable (e.g. #{chmod 755 "
-"auto/*}#)."
+"For your convenience, live-build comes with example auto shell scripts to "
+"copy and edit. Start a new, default configuration, then copy the examples "
+"into it:"
msgstr ""
-"Utiliser des exemples de scripts auto tels que les suivants comme point de "
-"départ pour votre nouvelle configuration de live-build. Prenez note que "
-"lorsque vous appelez la commande #{lb}# que votre script auto emballage, "
-"vous devez spécifier #{noauto}# comme paramètre afin de s'assurer que le "
-"script automatique n'est pas appelé à nouveau, de façon récursive. Aussi, "
-"n'oubliez pas de s'assurer que les scripts sont exécutables (par exemple #"
-"{chmod 755 auto/*}#)."
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:22
-msgid "#{auto/config}#"
+#: en/user_managing_a_configuration.ssi:25
+#, no-wrap
+msgid ""
+" $ mkdir mylive && cd mylive && lb config\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:29
+msgid "Edit #{auto/config}#, adding any options as you see fit. For instance:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:40
#, no-wrap
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --package-lists \"standard\" \\\n"
+" --architectures i386 \\\n"
+" --linux-flavours 686-pae \\\n"
+" --binary-images hdd \\\n"
+" --mirror-bootstrap http://ftp.es.debian.org/debian/ \\\n"
+" --mirror-binary http://ftp.es.debian.org/debian/ \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:33
-msgid "#{auto/clean}#"
+#: en/user_managing_a_configuration.ssi:44
+msgid ""
+"Now, each time you use #{lb config}#, #{auto/config}# will reset the "
+"configuration based on these options. When you want to make changes to them, "
+"edit the options in this file instead of passing them to #{lb config}#. When "
+"you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files "
+"along with any other build products. And finally, when you use #{lb build}#, "
+"a log of the build will be written by #{auto/build}# in #{build.log}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:41
-#, no-wrap
+#: en/user_managing_a_configuration.ssi:46
msgid ""
-" #!/bin/sh\n"
-" lb clean noauto \"${@}\"\n"
-" rm -f config/binary config/bootstrap \\\n"
-" config/chroot config/common config/source\n"
-" rm -f build.log\n"
+"Note: A special #{noauto}# parameter is used here to suppress another call "
+"to #{auto/config}#, thereby preventing infinite recursion. Make sure you "
+"don't accidentally remove it when making edits. Also, take care to ensure "
+"when you split the #{lb config}# command across multiple lines for "
+"readability, as shown in the example above, that you don't forget the "
+"backslash (\\) at the end of each line that continues to the next."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:45
-msgid "#{auto/build}#"
+#: en/user_managing_a_configuration.ssi:48
+msgid "2~ Clone a configuration published via Git"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-#, no-wrap
msgid ""
-" #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
+"Use the #{lb config --config}# option to clone a Git repository that "
+"contains a Debian Live configuration. If you would like to base your "
+"configuration on one maintained by the Debian Live project, look at http://"
+"live.debian.net/gitweb for the repositories prefixed with #{config-}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:52
msgid ""
-"We now ship example auto scripts with live-build based on the examples "
-"above. You may copy those as your starting point."
+"For example, to build a rescue image, use the #{config-rescue}# repository "
+"as follows:"
msgstr ""
-"Nous expédions maintenant scripts auto d'exemple avec live-build sur la base "
-"des exemples ci-dessus. Vous pouvez copier ces comme point de départ."
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:58
+#: en/user_managing_a_configuration.ssi:57
#, no-wrap
-msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
+msgid ""
+" $ mkdir live-rescue && cd live-rescue\n"
+" $ lb config git://live.debian.net/git/config-rescue.git\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:61
msgid ""
-"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
-"example above, #{--package-lists standard}# is set to the default value. "
-"Change this to an appropriate value for your image (or delete it if you want "
-"to use the default) and add any additional options in continuation lines "
-"that follow."
+"Edit #{auto/config}# and any other things you need in the #{config}# tree to "
+"suit your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:63
+msgid ""
+"You may optionally define a shortcut in your Git configuration by adding the "
+"following to your #{${HOME}/.gitconfig}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:68
+#, no-wrap
+msgid ""
+" [url \"git://live.debian.net/git/\"]\n"
+" insteadOf = ldn:\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:72
+msgid ""
+"This enables you to use #{ldn:}# anywhere you need to specify the address of "
+"a #{live.debian.net}# git repository. If you also drop the optional #{.git}# "
+"suffix, starting a new image using this configuration is as easy as:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:76
+#, no-wrap
+msgid " $ lb config ldn:config-rescue\n"
msgstr ""
-"Editer #{auto/config}#, en changeant ou en ajoutant des options comme bon "
-"vous semble. Dans l'exemple ci-dessus, #{--package-lists standard}# est fixé "
-"à la valeur par défaut. Changez ce à une valeur appropriée pour votre image "
-"(ou le supprimer si vous voulez utiliser par défaut) et ajouter des options "
-"supplémentaires dans les lignes suivantes."
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index 78a2847..737efc2 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-16 18:50+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-03-17 20:12+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -37,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -90,7 +91,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -107,56 +108,63 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
+msgstr " $ lb config --distribution sid\n"
+
+#. type: Plain text
#: en/user_overview.ssi:2
msgid ":B~ Overview of tools"
msgstr ":B~ Aperçu des outils"
@@ -321,9 +329,9 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config\n"
-" [2012-03-19 15:17:14] lb_config\n"
+" [2012-08-03 22:59:17] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree for a debian system\n"
+" P: Creating config tree for a debian/i386 system\n"
msgstr ""
#. type: Plain text
@@ -342,20 +350,18 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:47
+#, fuzzy
+#| msgid ""
+#| "Normally, you will want to specify some options. For example, to include "
+#| "the 'gnome' package list in your configuration:"
msgid ""
-"Normally, you will want to specify some options. For example, to include the "
-"'gnome' package list in your configuration:"
+"Normally, you will want to specify some options. For example, to specify "
+"which distribution you want to build using its codename:"
msgstr ""
"Normalement, vous voulez spécifier certaines options. Par exemple, pour "
"inclure la liste du paquet «gnome» dans votre configuration:"
#. type: Plain text
-#: en/user_overview.ssi:51
-#, no-wrap
-msgid " $ lb config -p gnome\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_overview.ssi:55
msgid "It is possible to specify many options, such as:"
msgstr "Il est possible de spécifier plusieurs options, telles que:"
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index 176f17b..cec7c45 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-02 00:07+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-06-18 19:33+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -50,7 +50,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-08-02\n"
+" :published: 2012-08-06\n"
msgstr ""
"@date:\n"
" :published: 2012-07-27\n"
diff --git a/manual/po/it/project_bugs.ssi.po b/manual/po/it/project_bugs.ssi.po
index ae85fa3..3e3faca 100644
--- a/manual/po/it/project_bugs.ssi.po
+++ b/manual/po/it/project_bugs.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2011-03-11 10:40+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -37,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -107,51 +108,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -168,11 +170,17 @@ msgstr "1~bugs Segnalare bug"
#. type: Plain text
#: en/project_bugs.ssi:6
+#, fuzzy
+#| msgid ""
+#| "Debian Live is far from being perfect, but we want to make it as close as "
+#| "possible to perfect - with your help. Do not hesitate to report a bug: it "
+#| "is better to fill a report twice than never. However, this chapter "
+#| "includes recommendations how to file good bug reports."
msgid ""
"Debian Live is far from being perfect, but we want to make it as close as "
-"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"possible to perfect - with your help. Do not hesitate to report a bug. It is "
"better to fill a report twice than never. However, this chapter includes "
-"recommendations how to file good bug reports."
+"recommendations on how to file good bug reports."
msgstr ""
"Debian Live è lungi dall'essere perfetta, ma con il vostro aiuto vogliamo "
"avvicinarci il più possibile a questo livello. Non esitare a segnalare un "
@@ -230,10 +238,15 @@ msgstr "2~ Problemi noti"
#. type: Plain text
#: en/project_bugs.ssi:18
+#, fuzzy
+#| msgid ""
+#| "Because Debian *{testing}* and Debian *{unstable}* distributions are a "
+#| "moving target, when you specify either as the target system distribution, "
+#| "a successful build may not always be possible."
msgid ""
-"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
-"moving target, when you specify either as the target system distribution, a "
-"successful build may not always be possible."
+"Since Debian *{testing}* and Debian *{unstable}* distributions are moving "
+"targets, when you specify either of them as the target system distribution, "
+"a successful build may not always be possible."
msgstr ""
"Giacché Debian *{testing}* e Debian *{unstable}* subiscono cambiamenti "
"continui, quando si specifica l'una o l'altra come sistema di destinazione, "
@@ -246,10 +259,15 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:22
+#, fuzzy
+#| msgid ""
+#| "If this causes too much difficulty for you, do not build a system based "
+#| "on *{testing}* or *{unstable}*, but rather, use *{stable}*. live-build "
+#| "does always default to the *{stable}* release."
msgid ""
"If this causes too much difficulty for you, do not build a system based on *"
-"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
-"always default to the *{stable}* release."
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always "
+"defaults to the *{stable}* release."
msgstr ""
"Se questo causa troppe difficoltà, non creare un sistema basato su *{testing}"
"* o *{unstable}* ma usare piuttosto *{stable}*. live-build si basa su *"
@@ -322,10 +340,16 @@ msgstr "2~collect-information Raccogliere informazioni"
#. type: Plain text
#: en/project_bugs.ssi:38
-msgid ""
-"Please provide enough information with your report. At least include the "
-"exact version of live-build version where the bug is encountered and steps "
-"to reproduce it. Please use common sense and include other relevant "
+#, fuzzy
+#| msgid ""
+#| "Please provide enough information with your report. At least include the "
+#| "exact version of live-build version where the bug is encountered and "
+#| "steps to reproduce it. Please use common sense and include other relevant "
+#| "information if you think that it might help in solving the problem."
+msgid ""
+"Please provide enough information with your report. Include, at least, the "
+"exact version of live-build where the bug is encountered and the steps to "
+"reproduce it. Please use your common sense and provide any other relevant "
"information if you think that it might help in solving the problem."
msgstr ""
"Nella segnalazione si invita a fornire informazioni sufficienti. Dovrebbe "
@@ -394,9 +418,14 @@ msgstr "_* Versione del kernel sul sistema live"
#. type: Plain text
#: en/project_bugs.ssi:60
+#, fuzzy
+#| msgid ""
+#| "You can generate a log of the build process by using the #{tee}# command. "
+#| "We recommend doing this automatically with an #{auto/build}# script; (see "
+#| "{Managing a configuration}#managing-a-configuration for details)."
msgid ""
"You can generate a log of the build process by using the #{tee}# command. We "
-"recommend doing this automatically with an #{auto/build}# script; (see "
+"recommend doing this automatically with an #{auto/build}# script (see "
"{Managing a configuration}#managing-a-configuration for details)."
msgstr ""
"È possibile generare un registro del processo di costruzione usando il "
@@ -405,8 +434,8 @@ msgstr ""
"configuration per i dettagli)."
#. type: Plain text
-#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
@@ -459,11 +488,22 @@ msgstr "2~ Se possibile isolare il caso non andato a buon fine"
#. type: Plain text
#: en/project_bugs.ssi:76
+#, fuzzy
+#| msgid ""
+#| "If possible, isolate the failing case to the smallest possible change "
+#| "that breaks. It is not always easy to do this, so if you can't manage it "
+#| "for your report, don't worry. However, if you plan your development cycle "
+#| "well, using small enough change sets per iteration, you may be able to "
+#| "isolate the problem by constructing a simpler 'base' configuration that "
+#| "closely matches your actual configuration plus just the broken change set "
+#| "added to it. If you have a hard time sorting out which of your changes "
+#| "broke, it may be that you are including too much in each change set and "
+#| "should develop in smaller increments."
msgid ""
"If possible, isolate the failing case to the smallest possible change that "
-"breaks. It is not always easy to do this, so if you can't manage it for your "
-"report, don't worry. However, if you plan your development cycle well, using "
-"small enough change sets per iteration, you may be able to isolate the "
+"breaks. It is not always easy to do this so if you cannot manage it for your "
+"report, do not worry. However, if you plan your development cycle well, "
+"using small enough change sets per iteration, you may be able to isolate the "
"problem by constructing a simpler 'base' configuration that closely matches "
"your actual configuration plus just the broken change set added to it. If "
"you have a hard time sorting out which of your changes broke, it may be that "
@@ -488,16 +528,16 @@ msgstr "2~ Segnalare il bug del pacchetto giusto"
#. type: Plain text
#: en/project_bugs.ssi:80
msgid ""
-"If you don't know what component is responsible for the bug or if the bug is "
-"a general bug concerning live systems, you can fill a bug against the debian-"
-"live pseudo-package."
+"If you do not know what component is responsible for the bug or if the bug "
+"is a general bug concerning live systems, you can fill a bug against the "
+"debian-live pseudo-package."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"However, we would appreciate if you try to narrow it down according to where "
-"the bug appears."
+"However, we would appreciate it if you try to narrow it down according to "
+"where the bug appears."
msgstr ""
#. type: Plain text
@@ -507,12 +547,19 @@ msgstr "3~ Durante la compilazione mentre esegue il bootstrap"
#. type: Plain text
#: en/project_bugs.ssi:86
+#, fuzzy
+#| msgid ""
+#| "live-build first bootstraps a basic Debian system with /{debootstrap}/ "
+#| "or /{cdebootstrap}/. Depending on the bootstrapping tool used and the "
+#| "Debian distribution it is bootstrapping, it may fail. If a bug appears "
+#| "here, check if the error is related to a specific Debian package (most "
+#| "likely), or if it is related to bootstrapping tool itself."
msgid ""
"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
-"is related to bootstrapping tool itself."
+"is related to the bootstrapping tool itself."
msgstr ""
"live-build avvia inizialmente un sistema Debian di base con /{debootstrap}/ "
"o /{cdebootstrap}/; può fallire a seconda dello strumento utilizzato e della "
@@ -522,9 +569,14 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:88
+#, fuzzy
+#| msgid ""
+#| "In both cases, this is not a bug in Debian Live, but rather in Debian "
+#| "itself which we can not fix this directly. Please report such a bug "
+#| "against the bootstrapping tool or the failing package."
msgid ""
"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
-"which we can not fix this directly. Please report such a bug against the "
+"and probably we cannot fix it directly. Please report such a bug against the "
"bootstrapping tool or the failing package."
msgstr ""
"In entrambi i casi non è un bug in Debian Live, ma piuttosto in Debian "
@@ -565,10 +617,15 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:96
+#, fuzzy
+#| msgid ""
+#| "Also, if you are using a local mirror and/or any of sort of proxy and you "
+#| "are experiencing a problem, please always reproduce it first by "
+#| "bootstrapping from an official mirror."
msgid ""
-"Also, if you are using a local mirror and/or any of sort of proxy and you "
-"are experiencing a problem, please always reproduce it first by "
-"bootstrapping from an official mirror."
+"Also, if you are using a local mirror and/or any sort of proxy and you are "
+"experiencing a problem, please always reproduce it first by bootstrapping "
+"from an official mirror."
msgstr ""
"Se si verifica un problema utilizzando un mirror locale o un qualsiasi tipo "
"di proxy è bene riprodurlo avviando da un mirror ufficiale."
@@ -580,13 +637,22 @@ msgstr "3~ In fase di avvio"
#. type: Plain text
#: en/project_bugs.ssi:100
+#, fuzzy
+#| msgid ""
+#| "If your image does not boot, please report it to the mailing list "
+#| "together with the information requested in {Collect information}#collect-"
+#| "information. Do not forget to mention, how/when the image failed, in "
+#| "Qemu, Virtualbox, VMWare or real hardware. If you are using a "
+#| "virtualization technology of any kind, please always run it on real "
+#| "hardware before reporting a bug. Providing a screenshot of the failure is "
+#| "also very helpful."
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
-"VMWare or real hardware. If you are using a virtualization technology of any "
-"kind, please always run it on real hardware before reporting a bug. "
-"Providing a screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, whether in Qemu, "
+"Virtualbox, VMWare or real hardware. If you are using a virtualization "
+"technology of any kind, please always run it on real hardware before "
+"reporting a bug. Providing a screenshot of the failure is also very helpful."
msgstr ""
"Se l'immagine non si avvia segnalarlo alla mailing list con le informazioni "
"richieste in {Raccogliere informazioni}#collect-information. Non dimenticare "
@@ -602,9 +668,13 @@ msgstr "3~ In fase di esecuzione"
#. type: Plain text
#: en/project_bugs.ssi:104
+#, fuzzy
+#| msgid ""
+#| "If a package was successfully installed, but fails while actually running "
+#| "the Live system, this is probably a bug in Debian Live. However,"
msgid ""
"If a package was successfully installed, but fails while actually running "
-"the Live system, this is probably a bug in Debian Live. However,"
+"the Live system, this is probably a bug in Debian Live. However:"
msgstr ""
"Se un pacchetto è stato installato con successo ma fallisce durante "
"l'esecuzione del sistema live, si tratta probabilmente di un bug in Debian "
@@ -617,11 +687,18 @@ msgstr "2~ Fare la ricerca"
#. type: Plain text
#: en/project_bugs.ssi:108
+#, fuzzy
+#| msgid ""
+#| "Before filing the bug, please search the web for the particular error "
+#| "message or symptom you are getting. As it is highly unlikely that you are "
+#| "the only person experiencing a particular problem, there is always a "
+#| "chance that it has been discussed elsewhere, and a possible solution, "
+#| "patch, or workaround has been proposed."
msgid ""
"Before filing the bug, please search the web for the particular error "
"message or symptom you are getting. As it is highly unlikely that you are "
-"the only person experiencing a particular problem, there is always a chance "
-"that it has been discussed elsewhere, and a possible solution, patch, or "
+"the only person experiencing a particular problem. There is always a chance "
+"that it has been discussed elsewhere and a possible solution, patch, or "
"workaround has been proposed."
msgstr ""
"Prima di riportare il bug si prega di cercare sul web il messaggio d'errore "
@@ -652,8 +729,8 @@ msgstr ""
#| "already."
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, live-config and live-tools to see whether something similar has been "
-"reported already."
+"boot, live-config and live-tools to see whether something similar has "
+"already been reported."
msgstr ""
"In aggiunta bisogna controllare l'attuale elenco dei bug riguardanti live-"
"build, live-boot e live-config per vedere se sia già stato segnalato "
diff --git a/manual/po/it/user_customization-contents.ssi.po b/manual/po/it/user_customization-contents.ssi.po
index 590107e..e634d57 100644
--- a/manual/po/it/user_customization-contents.ssi.po
+++ b/manual/po/it/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-04-03 18:21+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -20,8 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -38,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -91,8 +91,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -109,51 +108,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -192,12 +192,19 @@ msgstr "2~includes Include"
#. type: Plain text
#: en/user_customization-contents.ssi:10
+#, fuzzy
+#| msgid ""
+#| "While ideally a Debian live system would include files entirely provided "
+#| "by unmodified Debian packages, it is sometimes convenient to provide or "
+#| "modify some content by means of files. Using includes, it is possible to "
+#| "add (or replace) arbitrary files in your Debian Live image. live-build "
+#| "provides three mechanisms for using them:"
msgid ""
"While ideally a Debian live system would include files entirely provided by "
"unmodified Debian packages, it is sometimes convenient to provide or modify "
"some content by means of files. Using includes, it is possible to add (or "
-"replace) arbitrary files in your Debian Live image. live-build provides "
-"three mechanisms for using them:"
+"replace) arbitrary files in your Debian Live image. live-build provides two "
+"mechanisms for using them:"
msgstr ""
"Anche se idealmente un sistema live Debian dovrebbe includere file forniti "
"interamente dal pacchetti Debian non modificati, a volte è conveniente "
@@ -230,17 +237,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:16
msgid ""
-"_* Binary includes: These allow you to add or replace Debian specific files "
-"in the binary image, such as the templates and tools directories. Please see "
-"{Binary includes}#binary-includes for more information."
-msgstr ""
-"_* Include binari: permettono di aggiungere o sostituire specifici file "
-"Debian nell'immagine binaria, come le directory dei template e dei tool. "
-"Vedere {Include binari}#binary-includes per maggiori informazioni."
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid ""
"Please see {Terms}#terms for more information about the distinction between "
"the \"Live\" and \"binary\" images."
msgstr ""
@@ -248,12 +244,12 @@ msgstr ""
"distinzione tra immagini \"Live\" e \"binarie\"."
#. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:18
msgid "3~live-chroot-local-includes Live/chroot local includes"
msgstr "3~live-chroot-local-includes Live/chroot include locali"
#. type: Plain text
-#: en/user_customization-contents.ssi:22
+#: en/user_customization-contents.ssi:20
msgid ""
"Chroot local includes can be used to add or replace files in the chroot/Live "
"filesystem so that they may be used in the Live system. A typical use is to "
@@ -273,7 +269,7 @@ msgstr ""
"necessaria l'elaborazione."
#. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:22
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory #{/}# of the "
@@ -286,7 +282,7 @@ msgstr ""
"sistema live, si usi:"
#. type: Plain text
-#: en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:27
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/var/www\n"
@@ -294,12 +290,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:33
+#: en/user_customization-contents.ssi:31
msgid "Your configuration will then have the following layout:"
msgstr "La configurazione avrà quindi il seguente schema:"
#. type: Plain text
-#: en/user_customization-contents.ssi:44
+#: en/user_customization-contents.ssi:42
#, no-wrap
msgid ""
" -- config\n"
@@ -313,7 +309,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:48
+#: en/user_customization-contents.ssi:46
msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
@@ -322,12 +318,12 @@ msgstr ""
"pacchetti in modo che tali file vengano in seguito sovrascitti."
#. type: Plain text
-#: en/user_customization-contents.ssi:50
+#: en/user_customization-contents.ssi:48
msgid "3~binary-local-includes Binary local includes"
msgstr "3~binary-local-includes Include locali binari"
#. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: en/user_customization-contents.ssi:50
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 "
@@ -346,55 +342,23 @@ msgstr ""
"includes.binary/}# come segue:"
#. type: Plain text
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:54
#, no-wrap
msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:58
msgid "These files will now appear in the root directory of the live media."
msgstr "Questi file appariranno nella directory principale del supporto live."
#. type: Plain text
-#: en/user_customization-contents.ssi:62
-msgid "3~binary-includes Binary includes"
-msgstr "3~binary-includes Include binari"
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:64
-msgid ""
-"live-build has some standard files (like documentation) that gets included "
-"in the default configuration on every live media. This can be disabled with:"
-msgstr ""
-"live-build ha alcuni file standard (come la documentazione) inclusi nella "
-"configurazione predefinita di ogni supporto live. Ciò può essere "
-"disabilitato con:"
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:68
-#, no-wrap
-msgid " $ lb config --includes none\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:72
-msgid ""
-"Otherwise, the material will be installed by live-build in #{/includes/}# by "
-"default on the media filesystem, or else you can specify an alternate path "
-"with #{--includes}#."
-msgstr ""
-"In caso contrario il materiale verrà installato da live-build nella "
-"directory #{/includes/}# del filesystem in modo predefinito, oppure è "
-"possibile specificare un percorso alternativo con #{--includes}#."
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:74
+#: en/user_customization-contents.ssi:60
msgid "2~hooks Hooks"
msgstr "2~hooks Hook"
#. type: Plain text
-#: en/user_customization-contents.ssi:76
+#: en/user_customization-contents.ssi:62
msgid ""
"Hooks allow commands to be performed in the chroot and binary stages of the "
"build in order to customize the image."
@@ -403,12 +367,12 @@ msgstr ""
"della creazione al fine di personalizzare l'immagine."
#. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:64
msgid "3~live-chroot-local-hooks Live/chroot local hooks"
msgstr "3~live-chroot-local-hooks Live/chroot hook locali"
#. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:66
msgid ""
"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -429,12 +393,12 @@ msgstr ""
"examples/hooks}# da copiare o collegare nella propria configurazione."
#. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:68
msgid "3~boot-time-hooks Boot-time hooks"
msgstr "3~boot-time-hooks Hook in fase di avvio"
#. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:70
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-"
@@ -454,12 +418,12 @@ msgstr ""
"third-party-packages."
#. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:72
msgid "3~ Binary local hooks"
msgstr "3~ Hook binari locali"
#. type: Plain text
-#: en/user_customization-contents.ssi:88
+#: en/user_customization-contents.ssi:74
msgid ""
"To run commands in the binary stage, create a hook script with a #{.binary}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -482,12 +446,12 @@ msgstr ""
"copiare o collegare nella propria configurazione."
#. type: Plain text
-#: en/user_customization-contents.ssi:90
+#: en/user_customization-contents.ssi:76
msgid "2~ Preseeding Debconf questions"
msgstr "2~ Preconfigurare le domande di Debconf"
#. type: Plain text
-#: en/user_customization-contents.ssi:92
+#: en/user_customization-contents.ssi:78
msgid ""
"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
@@ -500,7 +464,7 @@ msgstr ""
"{debconf-set-selections}# durante la fase corrispondente."
#. type: Plain text
-#: en/user_customization-contents.ssi:93
+#: en/user_customization-contents.ssi:79
msgid ""
"For more information about debconf, please see #{debconf(7)}# in the /"
"{debconf}/ package."
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index f1fb8c9..4d6df1e 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-01 23:16+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-04-03 18:01+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -38,9 +38,8 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -68,22 +67,23 @@ msgstr ""
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -109,9 +109,8 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -139,22 +138,23 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -261,7 +261,7 @@ msgstr ""
"specificare:"
#. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config --distribution sid\n"
msgstr ""
@@ -691,9 +691,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:138
#, fuzzy
-#| msgid "3~ Local package lists"
-msgid "3~ Generated package lists"
-msgstr "3~ Elenchi locali dei pacchetti"
+#| msgid "3~package-lists Package lists"
+msgid "3~generated-package-lists Generated package lists"
+msgstr "3~package-lists Elenchi di pacchetti"
#. type: Plain text
#: en/user_customization-packages.ssi:140
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index cf0b2ae..cbb1e98 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-03-04 18:43+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -26,7 +26,7 @@ msgstr ":B~ Esempi"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -43,51 +43,52 @@ msgstr ":B~ Esempi"
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -96,7 +97,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -113,77 +114,78 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34 en/user_examples.ssi:109
+#: en/user_basics.ssi:34 en/user_examples.ssi:107
#, no-wrap
msgid " $ lb config\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:127 en/user_examples.ssi:219
+#: en/user_examples.ssi:125 en/user_examples.ssi:217
#, no-wrap
msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:94
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -351,17 +353,16 @@ msgstr ""
"Live."
#. type: Plain text
-#: en/user_examples.ssi:59
+#: en/user_examples.ssi:58
#, no-wrap
msgid ""
" $ mkdir tutorial2\n"
" $ cd tutorial2\n"
-" $ lb config -p lxde\n"
-" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-lxde-desktop iceweasel\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:63
+#: en/user_examples.ssi:62
msgid ""
"Our choice of LXDE for this example reflects our desire to provide a minimal "
"desktop environment, since the focus of the image is the single use we have "
@@ -379,7 +380,7 @@ msgstr ""
"come esercizio per il lettore."
#. type: Plain text
-#: en/user_examples.ssi:65
+#: en/user_examples.ssi:64
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
@@ -388,25 +389,25 @@ msgstr ""
"{Tutorial 1}#tutorial-1:"
#. type: Plain text
-#: en/user_examples.ssi:73
+#: en/user_examples.ssi:72
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
"Di nuovo, si verifichi che l'immagine sia a posto e la si collaudi, come in "
"{Tutorial 1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:75
+#: en/user_examples.ssi:74
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr "2~tutorial-3 Tutorial 3: un'immagine personalizzata"
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:76
#, no-wrap
msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr "*{Caso d'uso:}* creazione di un progetto per costruire un'immagine personalizzata che contiene i pacchetti preferiti da portare con sé in una chiavetta USB ovunque si vada, e che evolve in revisioni successive allorché i bisogni o le preferenze cambino.\n"
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:78
msgid ""
"Since we will be changing our personalized image over a number of revisions, "
"and we want to track those changes, trying things experimentally and "
@@ -424,12 +425,12 @@ msgstr ""
"#managing-a-configuration."
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:80
msgid "3~ First revision"
msgstr "3~ Prima revisione"
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:86
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -438,47 +439,55 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:91
+#: en/user_examples.ssi:90
msgid "Edit #{auto/config}# to read as follows:"
msgstr "Modificare #{auto/config}# come segue:"
#. type: Plain text
-#: en/user_examples.ssi:101
+#: en/user_examples.ssi:99
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
-" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:105
+#: en/user_examples.ssi:103
msgid ""
"Perform #{lb config}# to generate the config tree, using the #{auto/config}# "
"script you just created:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:111
msgid "Now populate your local package list:"
msgstr "Popolare ora l'elenco locale dei pacchetti:"
#. type: Plain text
-#: en/user_examples.ssi:117
-#, no-wrap
-msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
-msgstr ""
+#: en/user_examples.ssi:115
+#, fuzzy, no-wrap
+#| msgid "Now append the /{vlc}/ package to our local package list in #{config/package-lists/my.list.chroot}#:"
+msgid " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgstr "Ora inserire il pacchetto /{vlc}/ all'elenco locale dei pacchetti #{config/package-lists/my.list.chroot}#:"
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:119
+#, fuzzy
+#| msgid ""
+#| "First, #{--architectures 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}/."
msgid ""
"First, #{--architectures 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 "
+"much older systems. Third, we have chosen the /{lxde}/ task metapackage to "
+"give us a minimal desktop. And finally, we have added two initial favourite "
"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
"Per prima cosa, #{--architectures i386}# assicura che sul nostro sistema #"
@@ -490,12 +499,12 @@ msgstr ""
"{iceweasel}/ e /{xchat}/."
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:121
msgid "Now, build the image:"
msgstr "Costruire quindi l'immagine:"
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:129
msgid ""
"Note that unlike in the first two tutorials, we no longer have to type #"
"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
@@ -504,7 +513,7 @@ msgstr ""
"{2>&1 | tee build.log}# dato che questo è ora incluso in #{auto/build}#."
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:131
msgid ""
"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
"satisfied it works, it's time to initialize our #{git}# repository, adding "
@@ -516,7 +525,7 @@ msgstr ""
"creati, e di fare poi il primo commit:"
#. type: Plain text
-#: en/user_examples.ssi:139
+#: en/user_examples.ssi:137
#, no-wrap
msgid ""
" $ git init\n"
@@ -525,12 +534,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:141
msgid "3~ Second revision"
msgstr "3~ Seconda revisione"
#. type: Plain text
-#: en/user_examples.ssi:145
+#: en/user_examples.ssi:143
msgid ""
"In this revision, we're going to clean up from the first build, add the /"
"{vlc}/ package to our configuration, rebuild, test and commit."
@@ -540,7 +549,7 @@ msgstr ""
"verifica e commit."
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:145
msgid ""
"The #{lb clean}# command will clean up all generated files from the previous "
"build except for the cache, which saves having to re-download packages. This "
@@ -553,13 +562,13 @@ msgstr ""
"passaggi per rigenerare i file dalla nuova configurazione."
#. type: Plain text
-#: en/user_examples.ssi:151
+#: en/user_examples.ssi:149
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:153
msgid ""
"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
@@ -568,36 +577,36 @@ msgstr ""
"package-lists/my.list.chroot}#:"
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:157
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:161
msgid "Build again:"
msgstr "Rigenerare nuovamente:"
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:165
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:169
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
"Verificare, e quando soddisfatti, eseguire il commit della revisione "
"successiva:"
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:173
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:179
+#: en/user_examples.ssi:177
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -615,7 +624,7 @@ msgstr ""
"#{lb config}# attraverso i loro rispettivi script #{auto}#."
#. type: Plain text
-#: en/user_examples.ssi:181
+#: en/user_examples.ssi:179
msgid ""
"We've come to the end of our tutorial series. While many more kinds of "
"customization are possible, even just using the few features explored in "
@@ -631,45 +640,49 @@ msgstr ""
"utenti Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:183
+#: en/user_examples.ssi:181
msgid "2~ A VNC Kiosk Client"
msgstr "2~ Un client Kiosk VNC"
#. type: Plain text
-#: en/user_examples.ssi:185
+#: en/user_examples.ssi:183
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr "*{Caso d'uso:}* creazione di un'immagine con live-build per avviare direttamente un server VNC.\n"
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:185
msgid ""
-"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
-"{xvnc4viewer}/, disabling recommends to make a minimal system:"
+"Make a build directory and create an skeletal configuration inside it, "
+"disabling recommends to make a minimal system. And then create two package "
+"lists: the first one generated with a script provided by live-build named #"
+"{Packages}# (see {Generated package lists}#generated-package-lists), and the "
+"second one including /{xorg}/, /{gdm3}/, /{metacity}/ and /{xvnc4viewer}/."
msgstr ""
-"Creare una directory con al suo interno una configurazione scheletrica "
-"costruita sulla base dell'elenco di standard-x11, tra cui /{gdm3}/, /"
-"{metacity}/ e /{xvnc4viewer}/, disabilitando i raccomandati per ottenere un "
-"sistema minimale:"
#. type: Plain text
-#: en/user_examples.ssi:195
+#: en/user_examples.ssi:193
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\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"
+" $ lb config -a i386 -k 686-pae --apt-recommends false\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo \"xorg gdm3 metacity xvnc4viewer\" > config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
+#: en/user_examples.ssi:197
+#, fuzzy
+#| msgid ""
+#| "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it "
+#| "for the default user that will launch /{metacity}/ and start /"
+#| "{xvncviewer}/, connecting to port #{5901}# on a server at #{192.168.1.2}#:"
msgid ""
-"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
-"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
+"Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a "
+"custom #{.xsession}# in it for the default user that will launch /"
+"{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a "
+"server at #{192.168.1.2}#:"
msgstr ""
"Creare la directory #{/etc/skel}# e inserirvi un #{.xsession}# "
"personalizzato per l'utente predefinito che lancerà /{metacity}/ e avvierà /"
@@ -677,7 +690,7 @@ msgstr ""
"{192.168.1.2}#:"
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -686,7 +699,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:206
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -694,7 +707,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:209
#, no-wrap
msgid ""
" exit\n"
@@ -702,38 +715,50 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:213
msgid "Build the image:"
msgstr "Costruire l'immagine:"
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:221
msgid "Enjoy."
msgstr "Buon divertimento."
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:223
msgid "2~ A base image for a 128M USB key"
msgstr "2~ Un'immagine base per una chiavetta USB da 128M"
#. type: Plain text
-#: en/user_examples.ssi:227
-#, no-wrap
-msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+#: en/user_examples.ssi:225
+#, fuzzy, no-wrap
+#| msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.\n"
msgstr "*{Caso d'uso:}* creazione di un'immagine standard con alcuni componenti rimossi affinché possa stare su una chiavetta USB da 128M, con lo spazio che rimane da usarsi come meglio si crede.\n"
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:227
+#, fuzzy
+#| msgid ""
+#| "When optimizing an image to fit a certain media size, you need to "
+#| "understand the tradeoffs you are making between size and functionality. "
+#| "In this example, we trim only so much as to make room for additional "
+#| "material within a 128M media size, but without doing anything to destroy "
+#| "integrity of the packages contained within, such as the purging of locale "
+#| "data via the /{localepurge}/ package, or other such \"intrusive\" "
+#| "optimizations. Of particular note, you should not use #{--bootstrap-"
+#| "flavour minimal}# unless you really know what you're doing, as omitting "
+#| "priority *{important}* packages will most likely produce a broken live "
+#| "system."
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
-"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the /"
+"a 128M media size, but without doing anything to destroy the integrity of "
+"the packages contained within, such as the purging of locale data via the /"
"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
-"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority *{important}* "
-"packages will most likely produce a broken live system."
+"particular note, in order to understand what the #{minimal.chroot}# hook "
+"does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#"
msgstr ""
"Quando si cerca di ottimizzare un'immagine affinché sia contenuta in un "
"supporto, è necessario capire il compromesso che si deve fare tra la "
@@ -746,45 +771,63 @@ msgstr ""
"{important}* che molto probabilmente produrrà un sistema live danneggiato."
#. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:232
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --apt-indices false \\\n"
-" --memtest none --apt-recommends false --includes none\n"
+" $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none\n"
+" $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:236
msgid "Now, build the image in the usual way:"
msgstr "Costruire quindi l'immagine nel modo consueto:"
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:244
+#, fuzzy
+#| msgid ""
+#| "On the author's system at time of writing, the above configuration "
+#| "produced a 78Mbyte image. This compares favourably with the 166Mbyte "
+#| "image produced by the default configuration in {Tutorial 1}#tutorial-1."
msgid ""
-"On the author's system at time of writing, the above configuration produced "
-"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
-"by the default configuration in {Tutorial 1}#tutorial-1."
+"On the author's system at the time of writing this, the above configuration "
+"produced a 95Mbyte image. This compares favourably with the 182Mbyte image "
+"produced by the default configuration in {Tutorial 1}#tutorial-1."
msgstr ""
"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."
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:246
+#, 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-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."
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-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."
+"system. 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. #{--memtest none}# prevents the "
+"installation of a memory tester. And finally, the execution of the #{minimal}"
+"# hook removes some unused packages and files."
msgstr ""
"Ciò che salva più spazio, comparato alla costruzione di un'immagine standard "
"su un sistema con architettura #{i386}#, è la selezione del solo kernel #"
@@ -800,6 +843,16 @@ msgstr ""
"se le funzionalità sacrificate con ciascuna ottimizzazione valgono la pena."
#. type: Plain text
+#: en/user_examples.ssi:248
+msgid ""
+"Using other hooks, like for example the #{stripped.chroot}# hook found in #{/"
+"usr/share/doc/live-build/examples/hooks}#, may shave off additional small "
+"amounts of space and produce an image of 76MB. But it is up to you to decide "
+"if the functionality that is sacrificed with each size optimization is worth "
+"the loss of functionality."
+msgstr ""
+
+#. type: Plain text
#: en/user_examples.ssi:250
msgid "2~ A localized KDE desktop and installer"
msgstr "2~ Un desktop KDE localizzato e l'installer"
diff --git a/manual/po/it/user_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
index 98cd1bb..d2c7282 100644
--- a/manual/po/it/user_managing_a_configuration.ssi.po
+++ b/manual/po/it/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2011-12-05 23:01+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -20,7 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -37,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -90,7 +91,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -107,51 +108,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -185,61 +187,62 @@ msgstr "2~ Utilizzare auto per gestire i cambiamenti di configurazione"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
msgid ""
-"Live configurations rarely are perfect on the first try. You'll likely need "
-"to make a series of revisions until you are satisfied. However, "
-"inconsistencies can creep into your configuration from one revision to the "
-"next if you aren't careful. The main problem is, once a variable is given a "
-"default value, that value will not be recomputed from other variables that "
-"may change in later revisions."
+"Live configurations rarely are perfect on the first try. It may be fine to "
+"pass #{lb config}# options from the command-line to perform a single build, "
+"but it is more typical to revise those options and build again until you are "
+"satisfied. To support these changes, you will need auto scripts which ensure "
+"your configuration is kept in a consistent state."
msgstr ""
-"Le configurazioni live raramente sono perfette da riuscire al primo colpo, "
-"servono una serie di revisioni prima di essere soddisfatti. Tuttavia, se non "
-"si presta attenzione, possono verificarsi delle incoerenze tra una revisione "
-"e l'altra se non si presta attenzione. Il problema principale è che una "
-"volta assegnato un valore predefinito ad una variabile, tale valore non sarà "
-"ricalcolato da altre variabili che possono cambiare in altre revisioni."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
-msgid ""
-"For example, when the distribution is first set, many 'dependent' variables "
-"are given default values that suit that distribution. However, if you later "
-"decide to change the distribution, those dependent variables continue to "
-"retain old values that are no longer appropriate."
+msgid "3~ Why you need auto"
msgstr ""
-"Per esempio, durante la prima configurazione della distribuzione, a molte "
-"variabili 'dipendenti' vengono dati valori predefiniti che si adattino.Per "
-"cui se in seguito si decide di cambiare distribuzione, quelle variabili "
-"continueranno a mantenere vecchi valori non più appropriati."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:14
msgid ""
-"A second, related problem is that if you run #{lb config}# and then upgrade "
-"to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your #"
-"{config/*}# files, which you will then need to use to set the appropriate "
-"option again."
+"The #{lb config}# command stores the options you pass to it in #{config/*}# "
+"files along with many other options set to default values. If you run #{lb "
+"config}# again, it will not reset any option that was defaulted based on "
+"your initial options. So, for example, if you run #{lb config}# again with a "
+"new value for #{--distribution}#, any dependent options that were defaulted "
+"for the old distribution may no longer work with the new. Nor are these "
+"files intended to be read or edited. They store values for over a hundred "
+"options, so nobody, let alone yourself, will be able to see in these which "
+"options you actually specified. And finally, if you run #{lb config}#, then "
+"upgrade live-build and it happens to rename an option, #{config/*}# would "
+"still contain variables named after the old option that are no longer valid."
msgstr ""
-"Un secondo problema correlato è l'eseguire #{lb config}# e aggiornare alla "
-"nuova versione di live-build il quale ha cambiato il nome di una delle "
-"variabili, lo si può scoprire solamente con una revisione manuale delle "
-"variabili nei file #{config/*}#, che sarà necessario utilizzare per "
-"impostare nuovamente le opzioni appropriate."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:16
+#, fuzzy
+#| msgid ""
+#| "All of this would be a terrible nuisance if it weren't for auto/* "
+#| "scripts, simple wrappers to the #{lb config}#, #{lb build}# and #{lb "
+#| "clean}# commands that are designed to help you manage your configuration. "
+#| "Simply create an auto/config script containing #{lb config}# command with "
+#| "all desired options, and an auto/clean that removes the files containing "
+#| "configuration variable values, and each time you run #{lb config}# and #"
+#| "{lb clean}#, these files will be executed. This will ensure that your "
+#| "configuration is kept internally consistent from one revision to the next "
+#| "and from one live-build release to the next (Although you will still have "
+#| "to take care and read the documentation when you upgrade live-build and "
+#| "make adjustments as needed)."
msgid ""
-"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
-"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
-"that are designed to help you manage your configuration. Simply create an "
-"auto/config script containing #{lb config}# command with all desired "
-"options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
-"files will be executed. This will ensure that your configuration is kept "
-"internally consistent from one revision to the next and from one live-build "
-"release to the next (Although you will still have to take care and read the "
-"documentation when you upgrade live-build and make adjustments as needed)."
+"For all these reasons, #{auto/*}# scripts will make your life easier. They "
+"are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# "
+"commands that are designed to help you manage your configuration. The #{auto/"
+"config}# script stores your #{lb config}# command with all desired options, "
+"the #{auto/clean}# script removes the files containing configuration "
+"variable values, and the #{auto/build}# script keeps a #{build.log}# of each "
+"build. Each of these scripts is run automatically every time you run the "
+"corresponding #{lb}# command. By using these scripts, your configuration is "
+"easier to read and is kept internally consistent from one revision to the "
+"next. Also, it will be much easier for you identify and fix options which "
+"need to change when you upgrade live-build after reading the updated "
+"documentation."
msgstr ""
"Tutto ciò potrebbe essere un fastidio terribile se non fosse per gli script "
"auto/*, semplici wrapper ai comandi #{lb config}#, #{lb build}# e #{lb clean}"
@@ -255,96 +258,129 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
-msgid "2~ Example auto scripts"
+#, fuzzy
+#| msgid "2~ Example auto scripts"
+msgid "3~ Use example auto scripts"
msgstr "2~ Esempi di script automatici"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:20
msgid ""
-"Use auto script examples such as the following as the starting point for "
-"your new live-build configuration. Take note that when you call the #{lb}# "
-"command that the auto script wraps, you must specify #{noauto}# as its "
-"parameter to ensure that the auto script isn't called again, recursively. "
-"Also, don't forget to ensure the scripts are executable (e.g. #{chmod 755 "
-"auto/*}#)."
+"For your convenience, live-build comes with example auto shell scripts to "
+"copy and edit. Start a new, default configuration, then copy the examples "
+"into it:"
msgstr ""
-"Usare esempi di script automatici come il seguente come punto di partenza "
-"per una nuova configurazione di live-build. Si noti che quando si invoca il "
-"comando #{lb}# incluso nello script, si deve specificare il parametro #"
-"{noauto}# per essere certi che lo script stesso non venga richiamato "
-"ricorsivamente. Non dimenticare, inoltre, di accertarsi che gli script siano "
-"eseguibili (es. #{chmod 755 auto/*}#)."
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:22
-msgid "#{auto/config}#"
+#: en/user_managing_a_configuration.ssi:25
+#, no-wrap
+msgid ""
+" $ mkdir mylive && cd mylive && lb config\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:29
+msgid "Edit #{auto/config}#, adding any options as you see fit. For instance:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:40
#, no-wrap
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --package-lists \"standard\" \\\n"
+" --architectures i386 \\\n"
+" --linux-flavours 686-pae \\\n"
+" --binary-images hdd \\\n"
+" --mirror-bootstrap http://ftp.es.debian.org/debian/ \\\n"
+" --mirror-binary http://ftp.es.debian.org/debian/ \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:33
-msgid "#{auto/clean}#"
+#: en/user_managing_a_configuration.ssi:44
+msgid ""
+"Now, each time you use #{lb config}#, #{auto/config}# will reset the "
+"configuration based on these options. When you want to make changes to them, "
+"edit the options in this file instead of passing them to #{lb config}#. When "
+"you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files "
+"along with any other build products. And finally, when you use #{lb build}#, "
+"a log of the build will be written by #{auto/build}# in #{build.log}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:41
-#, no-wrap
+#: en/user_managing_a_configuration.ssi:46
msgid ""
-" #!/bin/sh\n"
-" lb clean noauto \"${@}\"\n"
-" rm -f config/binary config/bootstrap \\\n"
-" config/chroot config/common config/source\n"
-" rm -f build.log\n"
+"Note: A special #{noauto}# parameter is used here to suppress another call "
+"to #{auto/config}#, thereby preventing infinite recursion. Make sure you "
+"don't accidentally remove it when making edits. Also, take care to ensure "
+"when you split the #{lb config}# command across multiple lines for "
+"readability, as shown in the example above, that you don't forget the "
+"backslash (\\) at the end of each line that continues to the next."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:45
-msgid "#{auto/build}#"
+#: en/user_managing_a_configuration.ssi:48
+msgid "2~ Clone a configuration published via Git"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-#, no-wrap
msgid ""
-" #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
+"Use the #{lb config --config}# option to clone a Git repository that "
+"contains a Debian Live configuration. If you would like to base your "
+"configuration on one maintained by the Debian Live project, look at http://"
+"live.debian.net/gitweb for the repositories prefixed with #{config-}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:52
msgid ""
-"We now ship example auto scripts with live-build based on the examples "
-"above. You may copy those as your starting point."
+"For example, to build a rescue image, use the #{config-rescue}# repository "
+"as follows:"
msgstr ""
-"Facciamo un esempio di script automatico per live-build basato sugli esempi "
-"precedenti; si possono copiare come punto di partenza."
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:58
+#: en/user_managing_a_configuration.ssi:57
#, no-wrap
-msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
+msgid ""
+" $ mkdir live-rescue && cd live-rescue\n"
+" $ lb config git://live.debian.net/git/config-rescue.git\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:61
msgid ""
-"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
-"example above, #{--package-lists standard}# is set to the default value. "
-"Change this to an appropriate value for your image (or delete it if you want "
-"to use the default) and add any additional options in continuation lines "
-"that follow."
+"Edit #{auto/config}# and any other things you need in the #{config}# tree to "
+"suit your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:63
+msgid ""
+"You may optionally define a shortcut in your Git configuration by adding the "
+"following to your #{${HOME}/.gitconfig}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:68
+#, no-wrap
+msgid ""
+" [url \"git://live.debian.net/git/\"]\n"
+" insteadOf = ldn:\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:72
+msgid ""
+"This enables you to use #{ldn:}# anywhere you need to specify the address of "
+"a #{live.debian.net}# git repository. If you also drop the optional #{.git}# "
+"suffix, starting a new image using this configuration is as easy as:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:76
+#, no-wrap
+msgid " $ lb config ldn:config-rescue\n"
msgstr ""
-"Modificare #{auto/config}# aggiungendo o togliendo le opzioni come meglio "
-"credi. Nel precedente esempio, #{--package-lists standard}# è impostato al "
-"valore predefinito; cambiarlo in un valore appropriato per l'immagine (o "
-"cancellarlo se si desidera utilizzare un valore predefinito) e aggiungere "
-"eventuali opzioni ulteriori in continuazione delle righe che seguono."
diff --git a/manual/po/it/user_overview.ssi.po b/manual/po/it/user_overview.ssi.po
index b6e6cce..07a3397 100644
--- a/manual/po/it/user_overview.ssi.po
+++ b/manual/po/it/user_overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-16 18:50+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-06-18 19:53+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -20,7 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -37,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -90,7 +91,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -107,56 +108,63 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
+msgstr ""
+
+#. type: Plain text
#: en/user_overview.ssi:2
msgid ":B~ Overview of tools"
msgstr ":B~ Panoramica degli strumenti"
@@ -320,9 +328,9 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config\n"
-" [2012-03-19 15:17:14] lb_config\n"
+" [2012-08-03 22:59:17] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree for a debian system\n"
+" P: Creating config tree for a debian/i386 system\n"
msgstr ""
#. type: Plain text
@@ -340,20 +348,18 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:47
+#, fuzzy
+#| msgid ""
+#| "Normally, you will want to specify some options. For example, to include "
+#| "the 'gnome' package list in your configuration:"
msgid ""
-"Normally, you will want to specify some options. For example, to include the "
-"'gnome' package list in your configuration:"
+"Normally, you will want to specify some options. For example, to specify "
+"which distribution you want to build using its codename:"
msgstr ""
"Normalmente si vorranno specificare delle opzioni, ad esempio per includere "
"nella propria configurazione l'elenco del pacchetto \"gnome\":"
#. type: Plain text
-#: en/user_overview.ssi:51
-#, no-wrap
-msgid " $ lb config -p gnome\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_overview.ssi:55
msgid "It is possible to specify many options, such as:"
msgstr "È possibile specificare molte opzioni, come:"
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index d074fe5..0dde2c8 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -11,7 +11,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-02 00:07+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -50,10 +50,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-08-02\n"
+" :published: 2012-08-06\n"
msgstr ""
"@date:\n"
-" :published: 02-08-2012\n"
+" :published: 06-08-2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/pt_BR/project_bugs.ssi.po b/manual/po/pt_BR/project_bugs.ssi.po
index a6b3e63..d630bef 100644
--- a/manual/po/pt_BR/project_bugs.ssi.po
+++ b/manual/po/pt_BR/project_bugs.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-10-25 23:27+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -36,51 +36,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -106,51 +107,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -169,9 +171,9 @@ msgstr ""
#: en/project_bugs.ssi:6
msgid ""
"Debian Live is far from being perfect, but we want to make it as close as "
-"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"possible to perfect - with your help. Do not hesitate to report a bug. It is "
"better to fill a report twice than never. However, this chapter includes "
-"recommendations how to file good bug reports."
+"recommendations on how to file good bug reports."
msgstr ""
#. type: Plain text
@@ -209,9 +211,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
-"moving target, when you specify either as the target system distribution, a "
-"successful build may not always be possible."
+"Since Debian *{testing}* and Debian *{unstable}* distributions are moving "
+"targets, when you specify either of them as the target system distribution, "
+"a successful build may not always be possible."
msgstr ""
#. type: Plain text
@@ -223,8 +225,8 @@ msgstr ""
#: en/project_bugs.ssi:22
msgid ""
"If this causes too much difficulty for you, do not build a system based on *"
-"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
-"always default to the *{stable}* release."
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always "
+"defaults to the *{stable}* release."
msgstr ""
#. type: Plain text
@@ -279,9 +281,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:38
msgid ""
-"Please provide enough information with your report. At least include the "
-"exact version of live-build version where the bug is encountered and steps "
-"to reproduce it. Please use common sense and include other relevant "
+"Please provide enough information with your report. Include, at least, the "
+"exact version of live-build where the bug is encountered and the steps to "
+"reproduce it. Please use your common sense and provide any other relevant "
"information if you think that it might help in solving the problem."
msgstr ""
@@ -342,13 +344,13 @@ msgstr ""
#: en/project_bugs.ssi:60
msgid ""
"You can generate a log of the build process by using the #{tee}# command. We "
-"recommend doing this automatically with an #{auto/build}# script; (see "
+"recommend doing this automatically with an #{auto/build}# script (see "
"{Managing a configuration}#managing-a-configuration for details)."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
@@ -387,9 +389,9 @@ msgstr ""
#: en/project_bugs.ssi:76
msgid ""
"If possible, isolate the failing case to the smallest possible change that "
-"breaks. It is not always easy to do this, so if you can't manage it for your "
-"report, don't worry. However, if you plan your development cycle well, using "
-"small enough change sets per iteration, you may be able to isolate the "
+"breaks. It is not always easy to do this so if you cannot manage it for your "
+"report, do not worry. However, if you plan your development cycle well, "
+"using small enough change sets per iteration, you may be able to isolate the "
"problem by constructing a simpler 'base' configuration that closely matches "
"your actual configuration plus just the broken change set added to it. If "
"you have a hard time sorting out which of your changes broke, it may be that "
@@ -405,16 +407,16 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:80
msgid ""
-"If you don't know what component is responsible for the bug or if the bug is "
-"a general bug concerning live systems, you can fill a bug against the debian-"
-"live pseudo-package."
+"If you do not know what component is responsible for the bug or if the bug "
+"is a general bug concerning live systems, you can fill a bug against the "
+"debian-live pseudo-package."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"However, we would appreciate if you try to narrow it down according to where "
-"the bug appears."
+"However, we would appreciate it if you try to narrow it down according to "
+"where the bug appears."
msgstr ""
#. type: Plain text
@@ -429,14 +431,14 @@ msgid ""
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
-"is related to bootstrapping tool itself."
+"is related to the bootstrapping tool itself."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:88
msgid ""
"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
-"which we can not fix this directly. Please report such a bug against the "
+"and probably we cannot fix it directly. Please report such a bug against the "
"bootstrapping tool or the failing package."
msgstr ""
@@ -466,9 +468,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:96
msgid ""
-"Also, if you are using a local mirror and/or any of sort of proxy and you "
-"are experiencing a problem, please always reproduce it first by "
-"bootstrapping from an official mirror."
+"Also, if you are using a local mirror and/or any sort of proxy and you are "
+"experiencing a problem, please always reproduce it first by bootstrapping "
+"from an official mirror."
msgstr ""
#. type: Plain text
@@ -481,10 +483,10 @@ msgstr ""
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
-"VMWare or real hardware. If you are using a virtualization technology of any "
-"kind, please always run it on real hardware before reporting a bug. "
-"Providing a screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, whether in Qemu, "
+"Virtualbox, VMWare or real hardware. If you are using a virtualization "
+"technology of any kind, please always run it on real hardware before "
+"reporting a bug. Providing a screenshot of the failure is also very helpful."
msgstr ""
#. type: Plain text
@@ -496,7 +498,7 @@ msgstr ""
#: en/project_bugs.ssi:104
msgid ""
"If a package was successfully installed, but fails while actually running "
-"the Live system, this is probably a bug in Debian Live. However,"
+"the Live system, this is probably a bug in Debian Live. However:"
msgstr ""
#. type: Plain text
@@ -509,8 +511,8 @@ msgstr ""
msgid ""
"Before filing the bug, please search the web for the particular error "
"message or symptom you are getting. As it is highly unlikely that you are "
-"the only person experiencing a particular problem, there is always a chance "
-"that it has been discussed elsewhere, and a possible solution, patch, or "
+"the only person experiencing a particular problem. There is always a chance "
+"that it has been discussed elsewhere and a possible solution, patch, or "
"workaround has been proposed."
msgstr ""
@@ -527,8 +529,8 @@ msgstr ""
#: en/project_bugs.ssi:112
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, live-config and live-tools to see whether something similar has been "
-"reported already."
+"boot, live-config and live-tools to see whether something similar has "
+"already been reported."
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 02494c2..a936103 100644
--- a/manual/po/pt_BR/user_customization-contents.ssi.po
+++ b/manual/po/pt_BR/user_customization-contents.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,8 +19,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -37,51 +36,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -90,8 +90,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -108,51 +107,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -189,8 +189,8 @@ msgid ""
"While ideally a Debian live system would include files entirely provided by "
"unmodified Debian packages, it is sometimes convenient to provide or modify "
"some content by means of files. Using includes, it is possible to add (or "
-"replace) arbitrary files in your Debian Live image. live-build provides "
-"three mechanisms for using them:"
+"replace) arbitrary files in your Debian Live image. live-build provides two "
+"mechanisms for using them:"
msgstr ""
#. type: Plain text
@@ -212,25 +212,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:16
msgid ""
-"_* Binary includes: These allow you to add or replace Debian specific files "
-"in the binary image, such as the templates and tools directories. Please see "
-"{Binary includes}#binary-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid ""
"Please see {Terms}#terms for more information about the distinction between "
"the \"Live\" and \"binary\" images."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:18
msgid "3~live-chroot-local-includes Live/chroot local includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:22
+#: en/user_customization-contents.ssi:20
msgid ""
"Chroot local includes can be used to add or replace files in the chroot/Live "
"filesystem so that they may be used in the Live system. A typical use is to "
@@ -242,7 +234,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:22
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory #{/}# of the "
@@ -251,7 +243,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:27
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/var/www\n"
@@ -259,12 +251,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:33
+#: en/user_customization-contents.ssi:31
msgid "Your configuration will then have the following layout:"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:44
+#: en/user_customization-contents.ssi:42
#, no-wrap
msgid ""
" -- config\n"
@@ -278,19 +270,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:48
+#: en/user_customization-contents.ssi:46
msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:50
+#: en/user_customization-contents.ssi:48
msgid "3~binary-local-includes Binary local includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: en/user_customization-contents.ssi:50
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 "
@@ -302,61 +294,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:54
#, no-wrap
msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:58
msgid "These files will now appear in the root directory of the live media."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:62
-msgid "3~binary-includes Binary includes"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:64
-msgid ""
-"live-build has some standard files (like documentation) that gets included "
-"in the default configuration on every live media. This can be disabled with:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:68
-#, no-wrap
-msgid " $ lb config --includes none\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:72
-msgid ""
-"Otherwise, the material will be installed by live-build in #{/includes/}# by "
-"default on the media filesystem, or else you can specify an alternate path "
-"with #{--includes}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:74
+#: en/user_customization-contents.ssi:60
msgid "2~hooks Hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:76
+#: en/user_customization-contents.ssi:62
msgid ""
"Hooks allow commands to be performed in the chroot and binary stages of the "
"build in order to customize the image."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:64
msgid "3~live-chroot-local-hooks Live/chroot local hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:66
msgid ""
"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -369,12 +335,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:68
msgid "3~boot-time-hooks Boot-time hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:70
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-"
@@ -386,12 +352,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:72
msgid "3~ Binary local hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:88
+#: en/user_customization-contents.ssi:74
msgid ""
"To run commands in the binary stage, create a hook script with a #{.binary}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -405,12 +371,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:90
+#: en/user_customization-contents.ssi:76
msgid "2~ Preseeding Debconf questions"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:92
+#: en/user_customization-contents.ssi:78
msgid ""
"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
@@ -419,7 +385,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:93
+#: en/user_customization-contents.ssi:79
msgid ""
"For more information about debconf, please see #{debconf(7)}# in the /"
"{debconf}/ package."
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 659b245..85e8cb9 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-01 23:16+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -36,9 +36,8 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -66,22 +65,23 @@ msgstr ""
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -107,9 +107,8 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -137,22 +136,23 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -212,7 +212,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config --distribution sid\n"
msgstr ""
@@ -542,7 +542,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:138
-msgid "3~ Generated package lists"
+msgid "3~generated-package-lists Generated package lists"
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 bc1e14c..39c916c 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -24,7 +24,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -41,51 +41,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -94,7 +95,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -111,77 +112,78 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34 en/user_examples.ssi:109
+#: en/user_basics.ssi:34 en/user_examples.ssi:107
#, no-wrap
msgid " $ lb config\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:127 en/user_examples.ssi:219
+#: en/user_examples.ssi:125 en/user_examples.ssi:217
#, no-wrap
msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:94
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -312,17 +314,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:59
+#: en/user_examples.ssi:58
#, no-wrap
msgid ""
" $ mkdir tutorial2\n"
" $ cd tutorial2\n"
-" $ lb config -p lxde\n"
-" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-lxde-desktop iceweasel\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:63
+#: en/user_examples.ssi:62
msgid ""
"Our choice of LXDE for this example reflects our desire to provide a minimal "
"desktop environment, since the focus of the image is the single use we have "
@@ -333,30 +334,30 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:65
+#: en/user_examples.ssi:64
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:73
+#: en/user_examples.ssi:72
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:75
+#: en/user_examples.ssi:74
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:76
#, no-wrap
msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:78
msgid ""
"Since we will be changing our personalized image over a number of revisions, "
"and we want to track those changes, trying things experimentally and "
@@ -367,12 +368,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:80
msgid "3~ First revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:86
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -381,64 +382,63 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:91
+#: en/user_examples.ssi:90
msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:101
+#: en/user_examples.ssi:99
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
-" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:105
+#: en/user_examples.ssi:103
msgid ""
"Perform #{lb config}# to generate the config tree, using the #{auto/config}# "
"script you just created:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:111
msgid "Now populate your local package list:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:117
+#: en/user_examples.ssi:115
#, no-wrap
-msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgid " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:119
msgid ""
"First, #{--architectures 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 "
+"much older systems. Third, we have chosen the /{lxde}/ task metapackage to "
+"give us a minimal desktop. And finally, we have added two initial favourite "
"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:121
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:129
msgid ""
"Note that unlike in the first two tutorials, we no longer have to type #"
"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:131
msgid ""
"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
"satisfied it works, it's time to initialize our #{git}# repository, adding "
@@ -446,7 +446,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:139
+#: en/user_examples.ssi:137
#, no-wrap
msgid ""
" $ git init\n"
@@ -455,19 +455,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:141
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:145
+#: en/user_examples.ssi:143
msgid ""
"In this revision, we're going to clean up from the first build, add the /"
"{vlc}/ package to our configuration, rebuild, test and commit."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:145
msgid ""
"The #{lb clean}# command will clean up all generated files from the previous "
"build except for the cache, which saves having to re-download packages. This "
@@ -476,47 +476,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:151
+#: en/user_examples.ssi:149
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:153
msgid ""
"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:157
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:161
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:165
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:169
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:173
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:179
+#: en/user_examples.ssi:177
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -527,7 +527,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:181
+#: en/user_examples.ssi:179
msgid ""
"We've come to the end of our tutorial series. While many more kinds of "
"customization are possible, even just using the few features explored in "
@@ -537,45 +537,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:183
+#: en/user_examples.ssi:181
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:185
+#: en/user_examples.ssi:183
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:185
msgid ""
-"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
-"{xvnc4viewer}/, disabling recommends to make a minimal system:"
+"Make a build directory and create an skeletal configuration inside it, "
+"disabling recommends to make a minimal system. And then create two package "
+"lists: the first one generated with a script provided by live-build named #"
+"{Packages}# (see {Generated package lists}#generated-package-lists), and the "
+"second one including /{xorg}/, /{gdm3}/, /{metacity}/ and /{xvnc4viewer}/."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:195
+#: en/user_examples.ssi:193
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\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"
+" $ lb config -a i386 -k 686-pae --apt-recommends false\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo \"xorg gdm3 metacity xvnc4viewer\" > config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
+#: en/user_examples.ssi:197
msgid ""
-"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
-"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
+"Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a "
+"custom #{.xsession}# in it for the default user that will launch /"
+"{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a "
+"server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -584,7 +587,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:206
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -592,7 +595,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:209
#, no-wrap
msgid ""
" exit\n"
@@ -600,77 +603,84 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:213
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:221
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:223
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:225
#, no-wrap
-msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:227
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
-"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the /"
+"a 128M media size, but without doing anything to destroy the integrity of "
+"the packages contained within, such as the purging of locale data via the /"
"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
-"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority *{important}* "
-"packages will most likely produce a broken live system."
+"particular note, in order to understand what the #{minimal.chroot}# hook "
+"does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:232
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --apt-indices false \\\n"
-" --memtest none --apt-recommends false --includes none\n"
+" $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none\n"
+" $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:236
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:244
msgid ""
-"On the author's system at time of writing, the above configuration produced "
-"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
-"by the default configuration in {Tutorial 1}#tutorial-1."
+"On the author's system at the time of writing this, the above configuration "
+"produced a 95Mbyte image. This compares favourably with the 182Mbyte image "
+"produced by the default configuration in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:246
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-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."
+"system. 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. #{--memtest none}# prevents the "
+"installation of a memory tester. And finally, the execution of the #{minimal}"
+"# hook removes some unused packages and files."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:248
+msgid ""
+"Using other hooks, like for example the #{stripped.chroot}# hook found in #{/"
+"usr/share/doc/live-build/examples/hooks}#, may shave off additional small "
+"amounts of space and produce an image of 76MB. But it is up to you to decide "
+"if the functionality that is sacrificed with each size optimization is worth "
+"the loss of functionality."
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_managing_a_configuration.ssi.po b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
index f576f70..b8bc039 100644
--- a/manual/po/pt_BR/user_managing_a_configuration.ssi.po
+++ b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,7 +19,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -36,51 +36,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -89,7 +90,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -106,51 +107,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -181,127 +183,174 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
msgid ""
-"Live configurations rarely are perfect on the first try. You'll likely need "
-"to make a series of revisions until you are satisfied. However, "
-"inconsistencies can creep into your configuration from one revision to the "
-"next if you aren't careful. The main problem is, once a variable is given a "
-"default value, that value will not be recomputed from other variables that "
-"may change in later revisions."
+"Live configurations rarely are perfect on the first try. It may be fine to "
+"pass #{lb config}# options from the command-line to perform a single build, "
+"but it is more typical to revise those options and build again until you are "
+"satisfied. To support these changes, you will need auto scripts which ensure "
+"your configuration is kept in a consistent state."
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
-msgid ""
-"For example, when the distribution is first set, many 'dependent' variables "
-"are given default values that suit that distribution. However, if you later "
-"decide to change the distribution, those dependent variables continue to "
-"retain old values that are no longer appropriate."
+msgid "3~ Why you need auto"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:14
msgid ""
-"A second, related problem is that if you run #{lb config}# and then upgrade "
-"to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your #"
-"{config/*}# files, which you will then need to use to set the appropriate "
-"option again."
+"The #{lb config}# command stores the options you pass to it in #{config/*}# "
+"files along with many other options set to default values. If you run #{lb "
+"config}# again, it will not reset any option that was defaulted based on "
+"your initial options. So, for example, if you run #{lb config}# again with a "
+"new value for #{--distribution}#, any dependent options that were defaulted "
+"for the old distribution may no longer work with the new. Nor are these "
+"files intended to be read or edited. They store values for over a hundred "
+"options, so nobody, let alone yourself, will be able to see in these which "
+"options you actually specified. And finally, if you run #{lb config}#, then "
+"upgrade live-build and it happens to rename an option, #{config/*}# would "
+"still contain variables named after the old option that are no longer valid."
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:16
msgid ""
-"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
-"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
-"that are designed to help you manage your configuration. Simply create an "
-"auto/config script containing #{lb config}# command with all desired "
-"options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
-"files will be executed. This will ensure that your configuration is kept "
-"internally consistent from one revision to the next and from one live-build "
-"release to the next (Although you will still have to take care and read the "
-"documentation when you upgrade live-build and make adjustments as needed)."
+"For all these reasons, #{auto/*}# scripts will make your life easier. They "
+"are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# "
+"commands that are designed to help you manage your configuration. The #{auto/"
+"config}# script stores your #{lb config}# command with all desired options, "
+"the #{auto/clean}# script removes the files containing configuration "
+"variable values, and the #{auto/build}# script keeps a #{build.log}# of each "
+"build. Each of these scripts is run automatically every time you run the "
+"corresponding #{lb}# command. By using these scripts, your configuration is "
+"easier to read and is kept internally consistent from one revision to the "
+"next. Also, it will be much easier for you identify and fix options which "
+"need to change when you upgrade live-build after reading the updated "
+"documentation."
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
-msgid "2~ Example auto scripts"
+msgid "3~ Use example auto scripts"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:20
msgid ""
-"Use auto script examples such as the following as the starting point for "
-"your new live-build configuration. Take note that when you call the #{lb}# "
-"command that the auto script wraps, you must specify #{noauto}# as its "
-"parameter to ensure that the auto script isn't called again, recursively. "
-"Also, don't forget to ensure the scripts are executable (e.g. #{chmod 755 "
-"auto/*}#)."
+"For your convenience, live-build comes with example auto shell scripts to "
+"copy and edit. Start a new, default configuration, then copy the examples "
+"into it:"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:22
-msgid "#{auto/config}#"
+#: en/user_managing_a_configuration.ssi:25
+#, no-wrap
+msgid ""
+" $ mkdir mylive && cd mylive && lb config\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:29
+msgid "Edit #{auto/config}#, adding any options as you see fit. For instance:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:40
#, no-wrap
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --package-lists \"standard\" \\\n"
+" --architectures i386 \\\n"
+" --linux-flavours 686-pae \\\n"
+" --binary-images hdd \\\n"
+" --mirror-bootstrap http://ftp.es.debian.org/debian/ \\\n"
+" --mirror-binary http://ftp.es.debian.org/debian/ \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:33
-msgid "#{auto/clean}#"
+#: en/user_managing_a_configuration.ssi:44
+msgid ""
+"Now, each time you use #{lb config}#, #{auto/config}# will reset the "
+"configuration based on these options. When you want to make changes to them, "
+"edit the options in this file instead of passing them to #{lb config}#. When "
+"you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files "
+"along with any other build products. And finally, when you use #{lb build}#, "
+"a log of the build will be written by #{auto/build}# in #{build.log}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:41
-#, no-wrap
+#: en/user_managing_a_configuration.ssi:46
msgid ""
-" #!/bin/sh\n"
-" lb clean noauto \"${@}\"\n"
-" rm -f config/binary config/bootstrap \\\n"
-" config/chroot config/common config/source\n"
-" rm -f build.log\n"
+"Note: A special #{noauto}# parameter is used here to suppress another call "
+"to #{auto/config}#, thereby preventing infinite recursion. Make sure you "
+"don't accidentally remove it when making edits. Also, take care to ensure "
+"when you split the #{lb config}# command across multiple lines for "
+"readability, as shown in the example above, that you don't forget the "
+"backslash (\\) at the end of each line that continues to the next."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:45
-msgid "#{auto/build}#"
+#: en/user_managing_a_configuration.ssi:48
+msgid "2~ Clone a configuration published via Git"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-#, no-wrap
msgid ""
-" #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
+"Use the #{lb config --config}# option to clone a Git repository that "
+"contains a Debian Live configuration. If you would like to base your "
+"configuration on one maintained by the Debian Live project, look at http://"
+"live.debian.net/gitweb for the repositories prefixed with #{config-}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:52
msgid ""
-"We now ship example auto scripts with live-build based on the examples "
-"above. You may copy those as your starting point."
+"For example, to build a rescue image, use the #{config-rescue}# repository "
+"as follows:"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:58
+#: en/user_managing_a_configuration.ssi:57
#, no-wrap
-msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
+msgid ""
+" $ mkdir live-rescue && cd live-rescue\n"
+" $ lb config git://live.debian.net/git/config-rescue.git\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:61
msgid ""
-"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
-"example above, #{--package-lists standard}# is set to the default value. "
-"Change this to an appropriate value for your image (or delete it if you want "
-"to use the default) and add any additional options in continuation lines "
-"that follow."
+"Edit #{auto/config}# and any other things you need in the #{config}# tree to "
+"suit your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:63
+msgid ""
+"You may optionally define a shortcut in your Git configuration by adding the "
+"following to your #{${HOME}/.gitconfig}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:68
+#, no-wrap
+msgid ""
+" [url \"git://live.debian.net/git/\"]\n"
+" insteadOf = ldn:\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:72
+msgid ""
+"This enables you to use #{ldn:}# anywhere you need to specify the address of "
+"a #{live.debian.net}# git repository. If you also drop the optional #{.git}# "
+"suffix, starting a new image using this configuration is as easy as:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:76
+#, no-wrap
+msgid " $ lb config ldn:config-rescue\n"
msgstr ""
diff --git a/manual/po/pt_BR/user_overview.ssi.po b/manual/po/pt_BR/user_overview.ssi.po
index 925f104..7192286 100644
--- a/manual/po/pt_BR/user_overview.ssi.po
+++ b/manual/po/pt_BR/user_overview.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-16 18:50+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,7 +19,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -36,51 +36,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -89,7 +90,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -106,56 +107,63 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
+msgstr ""
+
+#. type: Plain text
#: en/user_overview.ssi:2
msgid ":B~ Overview of tools"
msgstr ""
@@ -281,9 +289,9 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config\n"
-" [2012-03-19 15:17:14] lb_config\n"
+" [2012-08-03 22:59:17] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree for a debian system\n"
+" P: Creating config tree for a debian/i386 system\n"
msgstr ""
#. type: Plain text
@@ -298,14 +306,8 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:47
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:51
-#, no-wrap
-msgid " $ lb config -p gnome\n"
+"Normally, you will want to specify some options. For example, to specify "
+"which distribution you want to build using its codename:"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index fe8fc07..615aff3 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-02 00:07+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2012-07-26 23:14+0200\n"
"Last-Translator: Victor Nitu <victor at debian-linux.ro>\n"
"Language-Team: none\n"
@@ -50,10 +50,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-08-02\n"
+" :published: 2012-08-06\n"
msgstr ""
"@date:\n"
-" :published: 02.08.2012\n"
+" :published: 06.08.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/ro/project_bugs.ssi.po b/manual/po/ro/project_bugs.ssi.po
index facc2ee..c997156 100644
--- a/manual/po/ro/project_bugs.ssi.po
+++ b/manual/po/ro/project_bugs.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-10-27 22:56+0200\n"
"Last-Translator: Creak <romain.failliot at foolstep.com>\n"
"Language-Team: Français <debian-live at lists.debian.org>\n"
@@ -37,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -107,51 +108,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -170,9 +172,9 @@ msgstr ""
#: en/project_bugs.ssi:6
msgid ""
"Debian Live is far from being perfect, but we want to make it as close as "
-"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"possible to perfect - with your help. Do not hesitate to report a bug. It is "
"better to fill a report twice than never. However, this chapter includes "
-"recommendations how to file good bug reports."
+"recommendations on how to file good bug reports."
msgstr ""
#. type: Plain text
@@ -210,9 +212,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
-"moving target, when you specify either as the target system distribution, a "
-"successful build may not always be possible."
+"Since Debian *{testing}* and Debian *{unstable}* distributions are moving "
+"targets, when you specify either of them as the target system distribution, "
+"a successful build may not always be possible."
msgstr ""
#. type: Plain text
@@ -224,8 +226,8 @@ msgstr ""
#: en/project_bugs.ssi:22
msgid ""
"If this causes too much difficulty for you, do not build a system based on *"
-"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
-"always default to the *{stable}* release."
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always "
+"defaults to the *{stable}* release."
msgstr ""
#. type: Plain text
@@ -280,9 +282,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:38
msgid ""
-"Please provide enough information with your report. At least include the "
-"exact version of live-build version where the bug is encountered and steps "
-"to reproduce it. Please use common sense and include other relevant "
+"Please provide enough information with your report. Include, at least, the "
+"exact version of live-build where the bug is encountered and the steps to "
+"reproduce it. Please use your common sense and provide any other relevant "
"information if you think that it might help in solving the problem."
msgstr ""
@@ -343,13 +345,13 @@ msgstr ""
#: en/project_bugs.ssi:60
msgid ""
"You can generate a log of the build process by using the #{tee}# command. We "
-"recommend doing this automatically with an #{auto/build}# script; (see "
+"recommend doing this automatically with an #{auto/build}# script (see "
"{Managing a configuration}#managing-a-configuration for details)."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
@@ -388,9 +390,9 @@ msgstr ""
#: en/project_bugs.ssi:76
msgid ""
"If possible, isolate the failing case to the smallest possible change that "
-"breaks. It is not always easy to do this, so if you can't manage it for your "
-"report, don't worry. However, if you plan your development cycle well, using "
-"small enough change sets per iteration, you may be able to isolate the "
+"breaks. It is not always easy to do this so if you cannot manage it for your "
+"report, do not worry. However, if you plan your development cycle well, "
+"using small enough change sets per iteration, you may be able to isolate the "
"problem by constructing a simpler 'base' configuration that closely matches "
"your actual configuration plus just the broken change set added to it. If "
"you have a hard time sorting out which of your changes broke, it may be that "
@@ -406,16 +408,16 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:80
msgid ""
-"If you don't know what component is responsible for the bug or if the bug is "
-"a general bug concerning live systems, you can fill a bug against the debian-"
-"live pseudo-package."
+"If you do not know what component is responsible for the bug or if the bug "
+"is a general bug concerning live systems, you can fill a bug against the "
+"debian-live pseudo-package."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"However, we would appreciate if you try to narrow it down according to where "
-"the bug appears."
+"However, we would appreciate it if you try to narrow it down according to "
+"where the bug appears."
msgstr ""
#. type: Plain text
@@ -430,14 +432,14 @@ msgid ""
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
-"is related to bootstrapping tool itself."
+"is related to the bootstrapping tool itself."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:88
msgid ""
"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
-"which we can not fix this directly. Please report such a bug against the "
+"and probably we cannot fix it directly. Please report such a bug against the "
"bootstrapping tool or the failing package."
msgstr ""
@@ -467,9 +469,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:96
msgid ""
-"Also, if you are using a local mirror and/or any of sort of proxy and you "
-"are experiencing a problem, please always reproduce it first by "
-"bootstrapping from an official mirror."
+"Also, if you are using a local mirror and/or any sort of proxy and you are "
+"experiencing a problem, please always reproduce it first by bootstrapping "
+"from an official mirror."
msgstr ""
#. type: Plain text
@@ -482,10 +484,10 @@ msgstr ""
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
-"VMWare or real hardware. If you are using a virtualization technology of any "
-"kind, please always run it on real hardware before reporting a bug. "
-"Providing a screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, whether in Qemu, "
+"Virtualbox, VMWare or real hardware. If you are using a virtualization "
+"technology of any kind, please always run it on real hardware before "
+"reporting a bug. Providing a screenshot of the failure is also very helpful."
msgstr ""
#. type: Plain text
@@ -497,7 +499,7 @@ msgstr ""
#: en/project_bugs.ssi:104
msgid ""
"If a package was successfully installed, but fails while actually running "
-"the Live system, this is probably a bug in Debian Live. However,"
+"the Live system, this is probably a bug in Debian Live. However:"
msgstr ""
#. type: Plain text
@@ -510,8 +512,8 @@ msgstr ""
msgid ""
"Before filing the bug, please search the web for the particular error "
"message or symptom you are getting. As it is highly unlikely that you are "
-"the only person experiencing a particular problem, there is always a chance "
-"that it has been discussed elsewhere, and a possible solution, patch, or "
+"the only person experiencing a particular problem. There is always a chance "
+"that it has been discussed elsewhere and a possible solution, patch, or "
"workaround has been proposed."
msgstr ""
@@ -528,8 +530,8 @@ msgstr ""
#: en/project_bugs.ssi:112
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, live-config and live-tools to see whether something similar has been "
-"reported already."
+"boot, live-config and live-tools to see whether something similar has "
+"already been reported."
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 0345a4e..99a8d33 100644
--- a/manual/po/ro/user_customization-contents.ssi.po
+++ b/manual/po/ro/user_customization-contents.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,8 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -38,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -91,8 +91,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -109,51 +108,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -190,8 +190,8 @@ msgid ""
"While ideally a Debian live system would include files entirely provided by "
"unmodified Debian packages, it is sometimes convenient to provide or modify "
"some content by means of files. Using includes, it is possible to add (or "
-"replace) arbitrary files in your Debian Live image. live-build provides "
-"three mechanisms for using them:"
+"replace) arbitrary files in your Debian Live image. live-build provides two "
+"mechanisms for using them:"
msgstr ""
#. type: Plain text
@@ -213,25 +213,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:16
msgid ""
-"_* Binary includes: These allow you to add or replace Debian specific files "
-"in the binary image, such as the templates and tools directories. Please see "
-"{Binary includes}#binary-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid ""
"Please see {Terms}#terms for more information about the distinction between "
"the \"Live\" and \"binary\" images."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:18
msgid "3~live-chroot-local-includes Live/chroot local includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:22
+#: en/user_customization-contents.ssi:20
msgid ""
"Chroot local includes can be used to add or replace files in the chroot/Live "
"filesystem so that they may be used in the Live system. A typical use is to "
@@ -243,7 +235,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:22
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory #{/}# of the "
@@ -252,7 +244,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:27
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/var/www\n"
@@ -260,12 +252,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:33
+#: en/user_customization-contents.ssi:31
msgid "Your configuration will then have the following layout:"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:44
+#: en/user_customization-contents.ssi:42
#, no-wrap
msgid ""
" -- config\n"
@@ -279,19 +271,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:48
+#: en/user_customization-contents.ssi:46
msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:50
+#: en/user_customization-contents.ssi:48
msgid "3~binary-local-includes Binary local includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: en/user_customization-contents.ssi:50
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 "
@@ -303,61 +295,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:54
#, no-wrap
msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:58
msgid "These files will now appear in the root directory of the live media."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:62
-msgid "3~binary-includes Binary includes"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:64
-msgid ""
-"live-build has some standard files (like documentation) that gets included "
-"in the default configuration on every live media. This can be disabled with:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:68
-#, no-wrap
-msgid " $ lb config --includes none\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:72
-msgid ""
-"Otherwise, the material will be installed by live-build in #{/includes/}# by "
-"default on the media filesystem, or else you can specify an alternate path "
-"with #{--includes}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:74
+#: en/user_customization-contents.ssi:60
msgid "2~hooks Hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:76
+#: en/user_customization-contents.ssi:62
msgid ""
"Hooks allow commands to be performed in the chroot and binary stages of the "
"build in order to customize the image."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:64
msgid "3~live-chroot-local-hooks Live/chroot local hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:66
msgid ""
"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -370,12 +336,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:68
msgid "3~boot-time-hooks Boot-time hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:70
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-"
@@ -387,12 +353,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:72
msgid "3~ Binary local hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:88
+#: en/user_customization-contents.ssi:74
msgid ""
"To run commands in the binary stage, create a hook script with a #{.binary}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -406,12 +372,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:90
+#: en/user_customization-contents.ssi:76
msgid "2~ Preseeding Debconf questions"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:92
+#: en/user_customization-contents.ssi:78
msgid ""
"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
@@ -420,7 +386,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:93
+#: en/user_customization-contents.ssi:79
msgid ""
"For more information about debconf, please see #{debconf(7)}# in the /"
"{debconf}/ package."
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 5ad9bfa..e7f269c 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-08-01 23:16+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,9 +37,8 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -67,22 +66,23 @@ msgstr ""
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -108,9 +108,8 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -138,22 +137,23 @@ msgstr "code{"
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -213,7 +213,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config --distribution sid\n"
msgstr ""
@@ -543,7 +543,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:138
-msgid "3~ Generated package lists"
+msgid "3~generated-package-lists Generated package lists"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index eb2655b..4bcf5d7 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -25,7 +25,7 @@ msgstr ":B~ Exemple"
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -42,51 +42,52 @@ msgstr ":B~ Exemple"
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -95,7 +96,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -112,77 +113,78 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34 en/user_examples.ssi:109
+#: en/user_basics.ssi:34 en/user_examples.ssi:107
#, no-wrap
msgid " $ lb config\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:127 en/user_examples.ssi:219
+#: en/user_examples.ssi:125 en/user_examples.ssi:217
#, no-wrap
msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:94
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -313,17 +315,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:59
+#: en/user_examples.ssi:58
#, no-wrap
msgid ""
" $ mkdir tutorial2\n"
" $ cd tutorial2\n"
-" $ lb config -p lxde\n"
-" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-lxde-desktop iceweasel\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:63
+#: en/user_examples.ssi:62
msgid ""
"Our choice of LXDE for this example reflects our desire to provide a minimal "
"desktop environment, since the focus of the image is the single use we have "
@@ -334,30 +335,30 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:65
+#: en/user_examples.ssi:64
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:73
+#: en/user_examples.ssi:72
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:75
+#: en/user_examples.ssi:74
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:76
#, no-wrap
msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:78
msgid ""
"Since we will be changing our personalized image over a number of revisions, "
"and we want to track those changes, trying things experimentally and "
@@ -368,12 +369,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:80
msgid "3~ First revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:86
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -382,64 +383,63 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:91
+#: en/user_examples.ssi:90
msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:101
+#: en/user_examples.ssi:99
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
-" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:105
+#: en/user_examples.ssi:103
msgid ""
"Perform #{lb config}# to generate the config tree, using the #{auto/config}# "
"script you just created:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:111
msgid "Now populate your local package list:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:117
+#: en/user_examples.ssi:115
#, no-wrap
-msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgid " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:119
msgid ""
"First, #{--architectures 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 "
+"much older systems. Third, we have chosen the /{lxde}/ task metapackage to "
+"give us a minimal desktop. And finally, we have added two initial favourite "
"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:121
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:129
msgid ""
"Note that unlike in the first two tutorials, we no longer have to type #"
"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:131
msgid ""
"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
"satisfied it works, it's time to initialize our #{git}# repository, adding "
@@ -447,7 +447,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:139
+#: en/user_examples.ssi:137
#, no-wrap
msgid ""
" $ git init\n"
@@ -456,19 +456,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:141
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:145
+#: en/user_examples.ssi:143
msgid ""
"In this revision, we're going to clean up from the first build, add the /"
"{vlc}/ package to our configuration, rebuild, test and commit."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:145
msgid ""
"The #{lb clean}# command will clean up all generated files from the previous "
"build except for the cache, which saves having to re-download packages. This "
@@ -477,47 +477,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:151
+#: en/user_examples.ssi:149
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:153
msgid ""
"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:157
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:161
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:165
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:169
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:173
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:179
+#: en/user_examples.ssi:177
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -528,7 +528,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:181
+#: en/user_examples.ssi:179
msgid ""
"We've come to the end of our tutorial series. While many more kinds of "
"customization are possible, even just using the few features explored in "
@@ -538,45 +538,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:183
+#: en/user_examples.ssi:181
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:185
+#: en/user_examples.ssi:183
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:185
msgid ""
-"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
-"{xvnc4viewer}/, disabling recommends to make a minimal system:"
+"Make a build directory and create an skeletal configuration inside it, "
+"disabling recommends to make a minimal system. And then create two package "
+"lists: the first one generated with a script provided by live-build named #"
+"{Packages}# (see {Generated package lists}#generated-package-lists), and the "
+"second one including /{xorg}/, /{gdm3}/, /{metacity}/ and /{xvnc4viewer}/."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:195
+#: en/user_examples.ssi:193
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\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"
+" $ lb config -a i386 -k 686-pae --apt-recommends false\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo \"xorg gdm3 metacity xvnc4viewer\" > config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
+#: en/user_examples.ssi:197
msgid ""
-"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
-"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
+"Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a "
+"custom #{.xsession}# in it for the default user that will launch /"
+"{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a "
+"server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -585,7 +588,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:206
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -593,7 +596,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:209
#, no-wrap
msgid ""
" exit\n"
@@ -601,77 +604,84 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:213
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:221
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:223
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:225
#, no-wrap
-msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:227
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
-"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the /"
+"a 128M media size, but without doing anything to destroy the integrity of "
+"the packages contained within, such as the purging of locale data via the /"
"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
-"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority *{important}* "
-"packages will most likely produce a broken live system."
+"particular note, in order to understand what the #{minimal.chroot}# hook "
+"does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:232
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --apt-indices false \\\n"
-" --memtest none --apt-recommends false --includes none\n"
+" $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none\n"
+" $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:236
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:244
msgid ""
-"On the author's system at time of writing, the above configuration produced "
-"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
-"by the default configuration in {Tutorial 1}#tutorial-1."
+"On the author's system at the time of writing this, the above configuration "
+"produced a 95Mbyte image. This compares favourably with the 182Mbyte image "
+"produced by the default configuration in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:246
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-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."
+"system. 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. #{--memtest none}# prevents the "
+"installation of a memory tester. And finally, the execution of the #{minimal}"
+"# hook removes some unused packages and files."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:248
+msgid ""
+"Using other hooks, like for example the #{stripped.chroot}# hook found in #{/"
+"usr/share/doc/live-build/examples/hooks}#, may shave off additional small "
+"amounts of space and produce an image of 76MB. But it is up to you to decide "
+"if the functionality that is sacrificed with each size optimization is worth "
+"the loss of functionality."
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index 4c08186..6ae20bb 100644
--- a/manual/po/ro/user_managing_a_configuration.ssi.po
+++ b/manual/po/ro/user_managing_a_configuration.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,7 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -37,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -90,7 +91,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -107,51 +108,52 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
@@ -182,127 +184,174 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
msgid ""
-"Live configurations rarely are perfect on the first try. You'll likely need "
-"to make a series of revisions until you are satisfied. However, "
-"inconsistencies can creep into your configuration from one revision to the "
-"next if you aren't careful. The main problem is, once a variable is given a "
-"default value, that value will not be recomputed from other variables that "
-"may change in later revisions."
+"Live configurations rarely are perfect on the first try. It may be fine to "
+"pass #{lb config}# options from the command-line to perform a single build, "
+"but it is more typical to revise those options and build again until you are "
+"satisfied. To support these changes, you will need auto scripts which ensure "
+"your configuration is kept in a consistent state."
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
-msgid ""
-"For example, when the distribution is first set, many 'dependent' variables "
-"are given default values that suit that distribution. However, if you later "
-"decide to change the distribution, those dependent variables continue to "
-"retain old values that are no longer appropriate."
+msgid "3~ Why you need auto"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:14
msgid ""
-"A second, related problem is that if you run #{lb config}# and then upgrade "
-"to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your #"
-"{config/*}# files, which you will then need to use to set the appropriate "
-"option again."
+"The #{lb config}# command stores the options you pass to it in #{config/*}# "
+"files along with many other options set to default values. If you run #{lb "
+"config}# again, it will not reset any option that was defaulted based on "
+"your initial options. So, for example, if you run #{lb config}# again with a "
+"new value for #{--distribution}#, any dependent options that were defaulted "
+"for the old distribution may no longer work with the new. Nor are these "
+"files intended to be read or edited. They store values for over a hundred "
+"options, so nobody, let alone yourself, will be able to see in these which "
+"options you actually specified. And finally, if you run #{lb config}#, then "
+"upgrade live-build and it happens to rename an option, #{config/*}# would "
+"still contain variables named after the old option that are no longer valid."
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:16
msgid ""
-"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
-"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
-"that are designed to help you manage your configuration. Simply create an "
-"auto/config script containing #{lb config}# command with all desired "
-"options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
-"files will be executed. This will ensure that your configuration is kept "
-"internally consistent from one revision to the next and from one live-build "
-"release to the next (Although you will still have to take care and read the "
-"documentation when you upgrade live-build and make adjustments as needed)."
+"For all these reasons, #{auto/*}# scripts will make your life easier. They "
+"are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# "
+"commands that are designed to help you manage your configuration. The #{auto/"
+"config}# script stores your #{lb config}# command with all desired options, "
+"the #{auto/clean}# script removes the files containing configuration "
+"variable values, and the #{auto/build}# script keeps a #{build.log}# of each "
+"build. Each of these scripts is run automatically every time you run the "
+"corresponding #{lb}# command. By using these scripts, your configuration is "
+"easier to read and is kept internally consistent from one revision to the "
+"next. Also, it will be much easier for you identify and fix options which "
+"need to change when you upgrade live-build after reading the updated "
+"documentation."
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
-msgid "2~ Example auto scripts"
+msgid "3~ Use example auto scripts"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:20
msgid ""
-"Use auto script examples such as the following as the starting point for "
-"your new live-build configuration. Take note that when you call the #{lb}# "
-"command that the auto script wraps, you must specify #{noauto}# as its "
-"parameter to ensure that the auto script isn't called again, recursively. "
-"Also, don't forget to ensure the scripts are executable (e.g. #{chmod 755 "
-"auto/*}#)."
+"For your convenience, live-build comes with example auto shell scripts to "
+"copy and edit. Start a new, default configuration, then copy the examples "
+"into it:"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:22
-msgid "#{auto/config}#"
+#: en/user_managing_a_configuration.ssi:25
+#, no-wrap
+msgid ""
+" $ mkdir mylive && cd mylive && lb config\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:29
+msgid "Edit #{auto/config}#, adding any options as you see fit. For instance:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:40
#, no-wrap
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --package-lists \"standard\" \\\n"
+" --architectures i386 \\\n"
+" --linux-flavours 686-pae \\\n"
+" --binary-images hdd \\\n"
+" --mirror-bootstrap http://ftp.es.debian.org/debian/ \\\n"
+" --mirror-binary http://ftp.es.debian.org/debian/ \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:33
-msgid "#{auto/clean}#"
+#: en/user_managing_a_configuration.ssi:44
+msgid ""
+"Now, each time you use #{lb config}#, #{auto/config}# will reset the "
+"configuration based on these options. When you want to make changes to them, "
+"edit the options in this file instead of passing them to #{lb config}#. When "
+"you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files "
+"along with any other build products. And finally, when you use #{lb build}#, "
+"a log of the build will be written by #{auto/build}# in #{build.log}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:41
-#, no-wrap
+#: en/user_managing_a_configuration.ssi:46
msgid ""
-" #!/bin/sh\n"
-" lb clean noauto \"${@}\"\n"
-" rm -f config/binary config/bootstrap \\\n"
-" config/chroot config/common config/source\n"
-" rm -f build.log\n"
+"Note: A special #{noauto}# parameter is used here to suppress another call "
+"to #{auto/config}#, thereby preventing infinite recursion. Make sure you "
+"don't accidentally remove it when making edits. Also, take care to ensure "
+"when you split the #{lb config}# command across multiple lines for "
+"readability, as shown in the example above, that you don't forget the "
+"backslash (\\) at the end of each line that continues to the next."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:45
-msgid "#{auto/build}#"
+#: en/user_managing_a_configuration.ssi:48
+msgid "2~ Clone a configuration published via Git"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-#, no-wrap
msgid ""
-" #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
+"Use the #{lb config --config}# option to clone a Git repository that "
+"contains a Debian Live configuration. If you would like to base your "
+"configuration on one maintained by the Debian Live project, look at http://"
+"live.debian.net/gitweb for the repositories prefixed with #{config-}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:52
msgid ""
-"We now ship example auto scripts with live-build based on the examples "
-"above. You may copy those as your starting point."
+"For example, to build a rescue image, use the #{config-rescue}# repository "
+"as follows:"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:58
+#: en/user_managing_a_configuration.ssi:57
#, no-wrap
-msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
+msgid ""
+" $ mkdir live-rescue && cd live-rescue\n"
+" $ lb config git://live.debian.net/git/config-rescue.git\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:61
msgid ""
-"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
-"example above, #{--package-lists standard}# is set to the default value. "
-"Change this to an appropriate value for your image (or delete it if you want "
-"to use the default) and add any additional options in continuation lines "
-"that follow."
+"Edit #{auto/config}# and any other things you need in the #{config}# tree to "
+"suit your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:63
+msgid ""
+"You may optionally define a shortcut in your Git configuration by adding the "
+"following to your #{${HOME}/.gitconfig}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:68
+#, no-wrap
+msgid ""
+" [url \"git://live.debian.net/git/\"]\n"
+" insteadOf = ldn:\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:72
+msgid ""
+"This enables you to use #{ldn:}# anywhere you need to specify the address of "
+"a #{live.debian.net}# git repository. If you also drop the optional #{.git}# "
+"suffix, starting a new image using this configuration is as easy as:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:76
+#, no-wrap
+msgid " $ lb config ldn:config-rescue\n"
msgstr ""
diff --git a/manual/po/ro/user_overview.ssi.po b/manual/po/ro/user_overview.ssi.po
index 864e14e..7c89204 100644
--- a/manual/po/ro/user_overview.ssi.po
+++ b/manual/po/ro/user_overview.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-16 18:50+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,7 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -37,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr "code{"
@@ -90,7 +91,7 @@ msgstr "code{"
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -107,56 +108,63 @@ msgstr "code{"
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr "}code"
#. type: Plain text
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
+msgstr ""
+
+#. type: Plain text
#: en/user_overview.ssi:2
msgid ":B~ Overview of tools"
msgstr ""
@@ -282,9 +290,9 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config\n"
-" [2012-03-19 15:17:14] lb_config\n"
+" [2012-08-03 22:59:17] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree for a debian system\n"
+" P: Creating config tree for a debian/i386 system\n"
msgstr ""
#. type: Plain text
@@ -299,14 +307,8 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:47
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:51
-#, no-wrap
-msgid " $ lb config -p gnome\n"
+"Normally, you will want to specify some options. For example, to specify "
+"which distribution you want to build using its codename:"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 66d5c47..aa5e0a6 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: 2012-08-02 00:07+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-08-02\n"
+" :published: 2012-08-06\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/project_bugs.ssi.pot b/manual/pot/project_bugs.ssi.pot
index 7bb9a2b..4e6af8b 100644
--- a/manual/pot/project_bugs.ssi.pot
+++ b/manual/pot/project_bugs.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -107,51 +108,52 @@ msgstr ""
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -170,9 +172,9 @@ msgstr ""
#: en/project_bugs.ssi:6
msgid ""
"Debian Live is far from being perfect, but we want to make it as close as "
-"possible to perfect - with your help. Do not hesitate to report a bug: it is "
+"possible to perfect - with your help. Do not hesitate to report a bug. It is "
"better to fill a report twice than never. However, this chapter includes "
-"recommendations how to file good bug reports."
+"recommendations on how to file good bug reports."
msgstr ""
#. type: Plain text
@@ -210,9 +212,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:18
msgid ""
-"Because Debian *{testing}* and Debian *{unstable}* distributions are a "
-"moving target, when you specify either as the target system distribution, a "
-"successful build may not always be possible."
+"Since Debian *{testing}* and Debian *{unstable}* distributions are moving "
+"targets, when you specify either of them as the target system distribution, "
+"a successful build may not always be possible."
msgstr ""
#. type: Plain text
@@ -224,8 +226,8 @@ msgstr ""
#: en/project_bugs.ssi:22
msgid ""
"If this causes too much difficulty for you, do not build a system based on *"
-"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does "
-"always default to the *{stable}* release."
+"{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always "
+"defaults to the *{stable}* release."
msgstr ""
#. type: Plain text
@@ -280,9 +282,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:38
msgid ""
-"Please provide enough information with your report. At least include the "
-"exact version of live-build version where the bug is encountered and steps "
-"to reproduce it. Please use common sense and include other relevant "
+"Please provide enough information with your report. Include, at least, the "
+"exact version of live-build where the bug is encountered and the steps to "
+"reproduce it. Please use your common sense and provide any other relevant "
"information if you think that it might help in solving the problem."
msgstr ""
@@ -343,13 +345,13 @@ msgstr ""
#: en/project_bugs.ssi:60
msgid ""
"You can generate a log of the build process by using the #{tee}# command. We "
-"recommend doing this automatically with an #{auto/build}# script; (see "
+"recommend doing this automatically with an #{auto/build}# script (see "
"{Managing a configuration}#managing-a-configuration for details)."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
@@ -388,9 +390,9 @@ msgstr ""
#: en/project_bugs.ssi:76
msgid ""
"If possible, isolate the failing case to the smallest possible change that "
-"breaks. It is not always easy to do this, so if you can't manage it for your "
-"report, don't worry. However, if you plan your development cycle well, using "
-"small enough change sets per iteration, you may be able to isolate the "
+"breaks. It is not always easy to do this so if you cannot manage it for your "
+"report, do not worry. However, if you plan your development cycle well, "
+"using small enough change sets per iteration, you may be able to isolate the "
"problem by constructing a simpler 'base' configuration that closely matches "
"your actual configuration plus just the broken change set added to it. If "
"you have a hard time sorting out which of your changes broke, it may be that "
@@ -406,16 +408,16 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:80
msgid ""
-"If you don't know what component is responsible for the bug or if the bug is "
-"a general bug concerning live systems, you can fill a bug against the debian-"
-"live pseudo-package."
+"If you do not know what component is responsible for the bug or if the bug "
+"is a general bug concerning live systems, you can fill a bug against the "
+"debian-live pseudo-package."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:82
msgid ""
-"However, we would appreciate if you try to narrow it down according to where "
-"the bug appears."
+"However, we would appreciate it if you try to narrow it down according to "
+"where the bug appears."
msgstr ""
#. type: Plain text
@@ -430,14 +432,14 @@ msgid ""
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
"distribution it is bootstrapping, it may fail. If a bug appears here, check "
"if the error is related to a specific Debian package (most likely), or if it "
-"is related to bootstrapping tool itself."
+"is related to the bootstrapping tool itself."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:88
msgid ""
"In both cases, this is not a bug in Debian Live, but rather in Debian itself "
-"which we can not fix this directly. Please report such a bug against the "
+"and probably we cannot fix it directly. Please report such a bug against the "
"bootstrapping tool or the failing package."
msgstr ""
@@ -467,9 +469,9 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:96
msgid ""
-"Also, if you are using a local mirror and/or any of sort of proxy and you "
-"are experiencing a problem, please always reproduce it first by "
-"bootstrapping from an official mirror."
+"Also, if you are using a local mirror and/or any sort of proxy and you are "
+"experiencing a problem, please always reproduce it first by bootstrapping "
+"from an official mirror."
msgstr ""
#. type: Plain text
@@ -482,10 +484,10 @@ msgstr ""
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
-"Do not forget to mention, how/when the image failed, in Qemu, Virtualbox, "
-"VMWare or real hardware. If you are using a virtualization technology of any "
-"kind, please always run it on real hardware before reporting a bug. "
-"Providing a screenshot of the failure is also very helpful."
+"Do not forget to mention, how/when the image failed, whether in Qemu, "
+"Virtualbox, VMWare or real hardware. If you are using a virtualization "
+"technology of any kind, please always run it on real hardware before "
+"reporting a bug. Providing a screenshot of the failure is also very helpful."
msgstr ""
#. type: Plain text
@@ -497,7 +499,7 @@ msgstr ""
#: en/project_bugs.ssi:104
msgid ""
"If a package was successfully installed, but fails while actually running "
-"the Live system, this is probably a bug in Debian Live. However,"
+"the Live system, this is probably a bug in Debian Live. However:"
msgstr ""
#. type: Plain text
@@ -510,8 +512,8 @@ msgstr ""
msgid ""
"Before filing the bug, please search the web for the particular error "
"message or symptom you are getting. As it is highly unlikely that you are "
-"the only person experiencing a particular problem, there is always a chance "
-"that it has been discussed elsewhere, and a possible solution, patch, or "
+"the only person experiencing a particular problem. There is always a chance "
+"that it has been discussed elsewhere and a possible solution, patch, or "
"workaround has been proposed."
msgstr ""
@@ -528,8 +530,8 @@ msgstr ""
#: en/project_bugs.ssi:112
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, live-config and live-tools to see whether something similar has been "
-"reported already."
+"boot, live-config and live-tools to see whether something similar has "
+"already been reported."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index 0218f95..df96847 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: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,8 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -38,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -91,8 +91,7 @@ msgstr ""
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -109,51 +108,52 @@ msgstr ""
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -190,8 +190,8 @@ msgid ""
"While ideally a Debian live system would include files entirely provided by "
"unmodified Debian packages, it is sometimes convenient to provide or modify "
"some content by means of files. Using includes, it is possible to add (or "
-"replace) arbitrary files in your Debian Live image. live-build provides "
-"three mechanisms for using them:"
+"replace) arbitrary files in your Debian Live image. live-build provides two "
+"mechanisms for using them:"
msgstr ""
#. type: Plain text
@@ -213,25 +213,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:16
msgid ""
-"_* Binary includes: These allow you to add or replace Debian specific files "
-"in the binary image, such as the templates and tools directories. Please see "
-"{Binary includes}#binary-includes for more information."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:18
-msgid ""
"Please see {Terms}#terms for more information about the distinction between "
"the \"Live\" and \"binary\" images."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:20
+#: en/user_customization-contents.ssi:18
msgid "3~live-chroot-local-includes Live/chroot local includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:22
+#: en/user_customization-contents.ssi:20
msgid ""
"Chroot local includes can be used to add or replace files in the chroot/Live "
"filesystem so that they may be used in the Live system. A typical use is to "
@@ -243,7 +235,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:22
msgid ""
"To include files, simply add them to your #{config/includes.chroot}# "
"directory. This directory corresponds to the root directory #{/}# of the "
@@ -252,7 +244,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:27
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/var/www\n"
@@ -260,12 +252,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:33
+#: en/user_customization-contents.ssi:31
msgid "Your configuration will then have the following layout:"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:44
+#: en/user_customization-contents.ssi:42
#, no-wrap
msgid ""
" -- config\n"
@@ -279,19 +271,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:48
+#: en/user_customization-contents.ssi:46
msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:50
+#: en/user_customization-contents.ssi:48
msgid "3~binary-local-includes Binary local includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:52
+#: en/user_customization-contents.ssi:50
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 "
@@ -303,61 +295,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:56
+#: en/user_customization-contents.ssi:54
#, no-wrap
msgid " $ cp ~/video_demo.* config/includes.binary/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:60
+#: en/user_customization-contents.ssi:58
msgid "These files will now appear in the root directory of the live media."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:62
-msgid "3~binary-includes Binary includes"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:64
-msgid ""
-"live-build has some standard files (like documentation) that gets included "
-"in the default configuration on every live media. This can be disabled with:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:68
-#, no-wrap
-msgid " $ lb config --includes none\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:72
-msgid ""
-"Otherwise, the material will be installed by live-build in #{/includes/}# by "
-"default on the media filesystem, or else you can specify an alternate path "
-"with #{--includes}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-contents.ssi:74
+#: en/user_customization-contents.ssi:60
msgid "2~hooks Hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:76
+#: en/user_customization-contents.ssi:62
msgid ""
"Hooks allow commands to be performed in the chroot and binary stages of the "
"build in order to customize the image."
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:78
+#: en/user_customization-contents.ssi:64
msgid "3~live-chroot-local-hooks Live/chroot local hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:80
+#: en/user_customization-contents.ssi:66
msgid ""
"To run commands in the chroot stage, create a hook script with a #{.chroot}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -370,12 +336,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:82
+#: en/user_customization-contents.ssi:68
msgid "3~boot-time-hooks Boot-time hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:84
+#: en/user_customization-contents.ssi:70
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-"
@@ -387,12 +353,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:86
+#: en/user_customization-contents.ssi:72
msgid "3~ Binary local hooks"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:88
+#: en/user_customization-contents.ssi:74
msgid ""
"To run commands in the binary stage, create a hook script with a #{.binary}# "
"suffix containing the commands in the #{config/hooks/}# directory. The hook "
@@ -406,12 +372,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:90
+#: en/user_customization-contents.ssi:76
msgid "2~ Preseeding Debconf questions"
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:92
+#: en/user_customization-contents.ssi:78
msgid ""
"Files in the #{config/preseed/}# directory suffixed with #{.preseed}# "
"followed by the stage (#{.chroot}# or #{.binary}#) are considered to be "
@@ -420,7 +386,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-contents.ssi:93
+#: en/user_customization-contents.ssi:79
msgid ""
"For more information about debconf, please see #{debconf(7)}# in the /"
"{debconf}/ package."
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 92985b1..d7c7dfa 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: 2012-08-01 23:16+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -37,9 +37,8 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: en/user_customization-installer.ssi:44
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -67,22 +66,23 @@ msgstr ""
#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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:115
-#: en/user_examples.ssi:125 en/user_examples.ssi:135 en/user_examples.ssi:149
-#: en/user_examples.ssi:157 en/user_examples.ssi:165 en/user_examples.ssi:173
-#: en/user_examples.ssi:189 en/user_examples.ssi:201 en/user_examples.ssi:217
-#: en/user_examples.ssi:231 en/user_examples.ssi:240 en/user_examples.ssi:258
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -108,9 +108,8 @@ msgstr ""
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: en/user_customization-installer.ssi:38
#: en/user_customization-installer.ssi:49
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -138,22 +137,23 @@ msgstr ""
#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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:119
-#: en/user_examples.ssi:129 en/user_examples.ssi:141 en/user_examples.ssi:153
-#: en/user_examples.ssi:161 en/user_examples.ssi:169 en/user_examples.ssi:177
-#: en/user_examples.ssi:197 en/user_examples.ssi:213 en/user_examples.ssi:221
-#: en/user_examples.ssi:236 en/user_examples.ssi:244 en/user_examples.ssi:262
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -213,7 +213,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:16
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
#, no-wrap
msgid " $ lb config --distribution sid\n"
msgstr ""
@@ -541,7 +541,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:138
-msgid "3~ Generated package lists"
+msgid "3~generated-package-lists Generated package lists"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index bb72093..8ad0d12 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: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -42,51 +42,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -95,7 +96,7 @@ msgstr ""
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -112,77 +113,78 @@ msgstr ""
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:242
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:68
+#: en/user_examples.ssi:240
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34 en/user_examples.ssi:109
+#: en/user_basics.ssi:34 en/user_examples.ssi:107
#, no-wrap
msgid " $ lb config\n"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:127 en/user_examples.ssi:219
+#: en/user_examples.ssi:125 en/user_examples.ssi:217
#, no-wrap
msgid " # lb build\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
+#: en/user_customization-binary.ssi:41 en/user_examples.ssi:94
#, no-wrap
msgid " #!/bin/sh\n"
msgstr ""
@@ -313,17 +315,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:59
+#: en/user_examples.ssi:58
#, no-wrap
msgid ""
" $ mkdir tutorial2\n"
" $ cd tutorial2\n"
-" $ lb config -p lxde\n"
-" $ echo iceweasel >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-lxde-desktop iceweasel\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:63
+#: en/user_examples.ssi:62
msgid ""
"Our choice of LXDE for this example reflects our desire to provide a minimal "
"desktop environment, since the focus of the image is the single use we have "
@@ -334,30 +335,30 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:65
+#: en/user_examples.ssi:64
msgid ""
"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:73
+#: en/user_examples.ssi:72
msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:75
+#: en/user_examples.ssi:74
msgid "2~tutorial-3 Tutorial 3: A personalized image"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:76
#, no-wrap
msgid "*{Use case:}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:78
msgid ""
"Since we will be changing our personalized image over a number of revisions, "
"and we want to track those changes, trying things experimentally and "
@@ -368,12 +369,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:80
msgid "3~ First revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:86
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
@@ -382,64 +383,63 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:91
+#: en/user_examples.ssi:90
msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:101
+#: en/user_examples.ssi:99
#, no-wrap
msgid ""
" lb config noauto \\\n"
" --architectures i386 \\\n"
" --linux-flavours 686-pae \\\n"
-" --package-lists lxde \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:105
+#: en/user_examples.ssi:103
msgid ""
"Perform #{lb config}# to generate the config tree, using the #{auto/config}# "
"script you just created:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:111
msgid "Now populate your local package list:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:117
+#: en/user_examples.ssi:115
#, no-wrap
-msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgid " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:121
+#: en/user_examples.ssi:119
msgid ""
"First, #{--architectures 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 "
+"much older systems. Third, we have chosen the /{lxde}/ task metapackage to "
+"give us a minimal desktop. And finally, we have added two initial favourite "
"packages: /{iceweasel}/ and /{xchat}/."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:121
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:129
msgid ""
"Note that unlike in the first two tutorials, we no longer have to type #"
"{2>&1 | tee build.log}# as that is now included in #{auto/build}#."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:133
+#: en/user_examples.ssi:131
msgid ""
"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
"satisfied it works, it's time to initialize our #{git}# repository, adding "
@@ -447,7 +447,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:139
+#: en/user_examples.ssi:137
#, no-wrap
msgid ""
" $ git init\n"
@@ -456,19 +456,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:141
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:145
+#: en/user_examples.ssi:143
msgid ""
"In this revision, we're going to clean up from the first build, add the /"
"{vlc}/ package to our configuration, rebuild, test and commit."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:145
msgid ""
"The #{lb clean}# command will clean up all generated files from the previous "
"build except for the cache, which saves having to re-download packages. This "
@@ -477,47 +477,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:151
+#: en/user_examples.ssi:149
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:153
msgid ""
"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:157
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:161
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:165
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:169
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:173
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:179
+#: en/user_examples.ssi:177
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -528,7 +528,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:181
+#: en/user_examples.ssi:179
msgid ""
"We've come to the end of our tutorial series. While many more kinds of "
"customization are possible, even just using the few features explored in "
@@ -538,45 +538,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:183
+#: en/user_examples.ssi:181
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:185
+#: en/user_examples.ssi:183
#, no-wrap
msgid "*{Use case:}* Create an image with live-build to boot directly to a VNC server.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:185
msgid ""
-"Make a build directory and create a skeletal configuration in it built "
-"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
-"{xvnc4viewer}/, disabling recommends to make a minimal system:"
+"Make a build directory and create an skeletal configuration inside it, "
+"disabling recommends to make a minimal system. And then create two package "
+"lists: the first one generated with a script provided by live-build named #"
+"{Packages}# (see {Generated package lists}#generated-package-lists), and the "
+"second one including /{xorg}/, /{gdm3}/, /{metacity}/ and /{xvnc4viewer}/."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:195
+#: en/user_examples.ssi:193
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
" $ cd vnc_kiosk_client\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"
+" $ lb config -a i386 -k 686-pae --apt-recommends false\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo \"xorg gdm3 metacity xvnc4viewer\" > config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
+#: en/user_examples.ssi:197
msgid ""
-"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
-"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
-"connecting to port #{5901}# on a server at #{192.168.1.2}#:"
+"Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a "
+"custom #{.xsession}# in it for the default user that will launch /"
+"{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a "
+"server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:203
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -585,7 +588,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:206
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -593,7 +596,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:209
#, no-wrap
msgid ""
" exit\n"
@@ -601,77 +604,84 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:213
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:221
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:223
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:225
#, no-wrap
-msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
+msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:227
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
"example, we trim only so much as to make room for additional material within "
-"a 128M media size, but without doing anything to destroy integrity of the "
-"packages contained within, such as the purging of locale data via the /"
+"a 128M media size, but without doing anything to destroy the integrity of "
+"the packages contained within, such as the purging of locale data via the /"
"{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
-"particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority *{important}* "
-"packages will most likely produce a broken live system."
+"particular note, in order to understand what the #{minimal.chroot}# hook "
+"does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:232
#, no-wrap
msgid ""
-" $ lb config -k 486 -p minimal --apt-indices false \\\n"
-" --memtest none --apt-recommends false --includes none\n"
+" $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none\n"
+" $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:236
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:244
msgid ""
-"On the author's system at time of writing, the above configuration produced "
-"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
-"by the default configuration in {Tutorial 1}#tutorial-1."
+"On the author's system at the time of writing this, the above configuration "
+"produced a 95Mbyte image. This compares favourably with the 182Mbyte image "
+"produced by the default configuration in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:246
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-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."
+"system. 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. #{--memtest none}# prevents the "
+"installation of a memory tester. And finally, the execution of the #{minimal}"
+"# hook removes some unused packages and files."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:248
+msgid ""
+"Using other hooks, like for example the #{stripped.chroot}# hook found in #{/"
+"usr/share/doc/live-build/examples/hooks}#, may shave off additional small "
+"amounts of space and produce an image of 76MB. But it is up to you to decide "
+"if the functionality that is sacrificed with each size optimization is worth "
+"the loss of functionality."
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index cf4e129..a29cbb0 100644
--- a/manual/pot/user_managing_a_configuration.ssi.pot
+++ b/manual/pot/user_managing_a_configuration.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -37,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
-#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:115
-#: en/user_customization-runtime.ssi:125 en/user_customization-runtime.ssi:133
-#: en/user_customization-runtime.ssi:148 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:115 en/user_examples.ssi:125
-#: en/user_examples.ssi:135 en/user_examples.ssi:149 en/user_examples.ssi:157
-#: en/user_examples.ssi:165 en/user_examples.ssi:173 en/user_examples.ssi:189
-#: en/user_examples.ssi:201 en/user_examples.ssi:217 en/user_examples.ssi:231
-#: en/user_examples.ssi:240 en/user_examples.ssi:258 en/user_examples.ssi:266
-#: en/user_examples.ssi:275 en/user_examples.ssi:285
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
+#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
+#: en/user_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -90,7 +91,7 @@ msgstr ""
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -107,51 +108,52 @@ msgstr ""
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
-#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:119
-#: en/user_customization-runtime.ssi:129 en/user_customization-runtime.ssi:138
-#: en/user_customization-runtime.ssi:155 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:119 en/user_examples.ssi:129
-#: en/user_examples.ssi:141 en/user_examples.ssi:153 en/user_examples.ssi:161
-#: en/user_examples.ssi:169 en/user_examples.ssi:177 en/user_examples.ssi:197
-#: en/user_examples.ssi:213 en/user_examples.ssi:221 en/user_examples.ssi:236
-#: en/user_examples.ssi:244 en/user_examples.ssi:262 en/user_examples.ssi:271
-#: en/user_examples.ssi:281 en/user_examples.ssi:299
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
+#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
+#: en/user_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
@@ -182,127 +184,174 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
msgid ""
-"Live configurations rarely are perfect on the first try. You'll likely need "
-"to make a series of revisions until you are satisfied. However, "
-"inconsistencies can creep into your configuration from one revision to the "
-"next if you aren't careful. The main problem is, once a variable is given a "
-"default value, that value will not be recomputed from other variables that "
-"may change in later revisions."
+"Live configurations rarely are perfect on the first try. It may be fine to "
+"pass #{lb config}# options from the command-line to perform a single build, "
+"but it is more typical to revise those options and build again until you are "
+"satisfied. To support these changes, you will need auto scripts which ensure "
+"your configuration is kept in a consistent state."
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
-msgid ""
-"For example, when the distribution is first set, many 'dependent' variables "
-"are given default values that suit that distribution. However, if you later "
-"decide to change the distribution, those dependent variables continue to "
-"retain old values that are no longer appropriate."
+msgid "3~ Why you need auto"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:14
msgid ""
-"A second, related problem is that if you run #{lb config}# and then upgrade "
-"to a new version of live-build that has changed one of the variable names, "
-"you will discover this only by manual review of the variables in your #"
-"{config/*}# files, which you will then need to use to set the appropriate "
-"option again."
+"The #{lb config}# command stores the options you pass to it in #{config/*}# "
+"files along with many other options set to default values. If you run #{lb "
+"config}# again, it will not reset any option that was defaulted based on "
+"your initial options. So, for example, if you run #{lb config}# again with a "
+"new value for #{--distribution}#, any dependent options that were defaulted "
+"for the old distribution may no longer work with the new. Nor are these "
+"files intended to be read or edited. They store values for over a hundred "
+"options, so nobody, let alone yourself, will be able to see in these which "
+"options you actually specified. And finally, if you run #{lb config}#, then "
+"upgrade live-build and it happens to rename an option, #{config/*}# would "
+"still contain variables named after the old option that are no longer valid."
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:16
msgid ""
-"All of this would be a terrible nuisance if it weren't for auto/* scripts, "
-"simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands "
-"that are designed to help you manage your configuration. Simply create an "
-"auto/config script containing #{lb config}# command with all desired "
-"options, and an auto/clean that removes the files containing configuration "
-"variable values, and each time you run #{lb config}# and #{lb clean}#, these "
-"files will be executed. This will ensure that your configuration is kept "
-"internally consistent from one revision to the next and from one live-build "
-"release to the next (Although you will still have to take care and read the "
-"documentation when you upgrade live-build and make adjustments as needed)."
+"For all these reasons, #{auto/*}# scripts will make your life easier. They "
+"are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# "
+"commands that are designed to help you manage your configuration. The #{auto/"
+"config}# script stores your #{lb config}# command with all desired options, "
+"the #{auto/clean}# script removes the files containing configuration "
+"variable values, and the #{auto/build}# script keeps a #{build.log}# of each "
+"build. Each of these scripts is run automatically every time you run the "
+"corresponding #{lb}# command. By using these scripts, your configuration is "
+"easier to read and is kept internally consistent from one revision to the "
+"next. Also, it will be much easier for you identify and fix options which "
+"need to change when you upgrade live-build after reading the updated "
+"documentation."
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
-msgid "2~ Example auto scripts"
+msgid "3~ Use example auto scripts"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:20
msgid ""
-"Use auto script examples such as the following as the starting point for "
-"your new live-build configuration. Take note that when you call the #{lb}# "
-"command that the auto script wraps, you must specify #{noauto}# as its "
-"parameter to ensure that the auto script isn't called again, recursively. "
-"Also, don't forget to ensure the scripts are executable (e.g. #{chmod 755 "
-"auto/*}#)."
+"For your convenience, live-build comes with example auto shell scripts to "
+"copy and edit. Start a new, default configuration, then copy the examples "
+"into it:"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:22
-msgid "#{auto/config}#"
+#: en/user_managing_a_configuration.ssi:25
+#, no-wrap
+msgid ""
+" $ mkdir mylive && cd mylive && lb config\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:29
+msgid "Edit #{auto/config}#, adding any options as you see fit. For instance:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:40
#, no-wrap
msgid ""
" #!/bin/sh\n"
" lb config noauto \\\n"
-" --package-lists \"standard\" \\\n"
+" --architectures i386 \\\n"
+" --linux-flavours 686-pae \\\n"
+" --binary-images hdd \\\n"
+" --mirror-bootstrap http://ftp.es.debian.org/debian/ \\\n"
+" --mirror-binary http://ftp.es.debian.org/debian/ \\\n"
" \"${@}\"\n"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:33
-msgid "#{auto/clean}#"
+#: en/user_managing_a_configuration.ssi:44
+msgid ""
+"Now, each time you use #{lb config}#, #{auto/config}# will reset the "
+"configuration based on these options. When you want to make changes to them, "
+"edit the options in this file instead of passing them to #{lb config}#. When "
+"you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files "
+"along with any other build products. And finally, when you use #{lb build}#, "
+"a log of the build will be written by #{auto/build}# in #{build.log}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:41
-#, no-wrap
+#: en/user_managing_a_configuration.ssi:46
msgid ""
-" #!/bin/sh\n"
-" lb clean noauto \"${@}\"\n"
-" rm -f config/binary config/bootstrap \\\n"
-" config/chroot config/common config/source\n"
-" rm -f build.log\n"
+"Note: A special #{noauto}# parameter is used here to suppress another call "
+"to #{auto/config}#, thereby preventing infinite recursion. Make sure you "
+"don't accidentally remove it when making edits. Also, take care to ensure "
+"when you split the #{lb config}# command across multiple lines for "
+"readability, as shown in the example above, that you don't forget the "
+"backslash (\\) at the end of each line that continues to the next."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:45
-msgid "#{auto/build}#"
+#: en/user_managing_a_configuration.ssi:48
+msgid "2~ Clone a configuration published via Git"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-#, no-wrap
msgid ""
-" #!/bin/sh\n"
-" lb build noauto \"${@}\" 2>&1 | tee build.log\n"
+"Use the #{lb config --config}# option to clone a Git repository that "
+"contains a Debian Live configuration. If you would like to base your "
+"configuration on one maintained by the Debian Live project, look at http://"
+"live.debian.net/gitweb for the repositories prefixed with #{config-}#."
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:52
msgid ""
-"We now ship example auto scripts with live-build based on the examples "
-"above. You may copy those as your starting point."
+"For example, to build a rescue image, use the #{config-rescue}# repository "
+"as follows:"
msgstr ""
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:58
+#: en/user_managing_a_configuration.ssi:57
#, no-wrap
-msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
+msgid ""
+" $ mkdir live-rescue && cd live-rescue\n"
+" $ lb config git://live.debian.net/git/config-rescue.git\n"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:61
msgid ""
-"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
-"example above, #{--package-lists standard}# is set to the default value. "
-"Change this to an appropriate value for your image (or delete it if you want "
-"to use the default) and add any additional options in continuation lines "
-"that follow."
+"Edit #{auto/config}# and any other things you need in the #{config}# tree to "
+"suit your needs."
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:63
+msgid ""
+"You may optionally define a shortcut in your Git configuration by adding the "
+"following to your #{${HOME}/.gitconfig}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:68
+#, no-wrap
+msgid ""
+" [url \"git://live.debian.net/git/\"]\n"
+" insteadOf = ldn:\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:72
+msgid ""
+"This enables you to use #{ldn:}# anywhere you need to specify the address of "
+"a #{live.debian.net}# git repository. If you also drop the optional #{.git}# "
+"suffix, starting a new image using this configuration is as easy as:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:76
+#, no-wrap
+msgid " $ lb config ldn:config-rescue\n"
msgstr ""
diff --git a/manual/pot/user_overview.ssi.pot b/manual/pot/user_overview.ssi.pot
index e23d228..783ba66 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: 2012-06-16 18:50+0300\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:62
#: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
#: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
#: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -37,51 +37,52 @@ msgstr ""
#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
#: en/user_customization-binary.ssi:14 en/user_customization-binary.ssi:28
-#: en/user_customization-binary.ssi:39 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-binary.ssi:39 en/user_customization-contents.ssi:24
+#: en/user_customization-contents.ssi:33 en/user_customization-contents.ssi:52
#: en/user_customization-installer.ssi:32
#: 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: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:27 en/user_customization-runtime.ssi:47
-#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:66
-#: en/user_customization-runtime.ssi:74 en/user_customization-runtime.ssi:83
-#: en/user_customization-runtime.ssi:112 en/user_customization-runtime.ssi:122
-#: en/user_customization-runtime.ssi:130 en/user_customization-runtime.ssi:145
+#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:320
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-runtime.ssi:27 en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:57 en/user_customization-runtime.ssi:76
+#: en/user_customization-runtime.ssi:84 en/user_customization-runtime.ssi:93
+#: en/user_customization-runtime.ssi:122 en/user_customization-runtime.ssi:132
+#: en/user_customization-runtime.ssi:140 en/user_customization-runtime.ssi:155
#: 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_examples.ssi:54 en/user_examples.ssi:66 en/user_examples.ssi:82
+#: en/user_examples.ssi:92 en/user_examples.ssi:105 en/user_examples.ssi:113
+#: en/user_examples.ssi:123 en/user_examples.ssi:133 en/user_examples.ssi:147
+#: en/user_examples.ssi:155 en/user_examples.ssi:163 en/user_examples.ssi:171
+#: en/user_examples.ssi:187 en/user_examples.ssi:199 en/user_examples.ssi:215
+#: en/user_examples.ssi:229 en/user_examples.ssi:238 en/user_examples.ssi:258
+#: en/user_examples.ssi:266 en/user_examples.ssi:275 en/user_examples.ssi:285
#: 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_managing_a_configuration.ssi:22
+#: en/user_managing_a_configuration.ssi:31
+#: en/user_managing_a_configuration.ssi:54
+#: en/user_managing_a_configuration.ssi:65
+#: en/user_managing_a_configuration.ssi:74 en/user_overview.ssi:36
#: en/user_overview.ssi:49 en/user_overview.ssi:57
msgid "code{"
msgstr ""
@@ -90,7 +91,7 @@ msgstr ""
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:66
#: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
#: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
#: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -107,56 +108,63 @@ msgstr ""
#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
#: en/user_customization-binary.ssi:18 en/user_customization-binary.ssi:35
-#: en/user_customization-binary.ssi:45 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-binary.ssi:45 en/user_customization-contents.ssi:29
+#: en/user_customization-contents.ssi:44 en/user_customization-contents.ssi:56
#: 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: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:21
-#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:51
-#: en/user_customization-runtime.ssi:62 en/user_customization-runtime.ssi:70
-#: en/user_customization-runtime.ssi:79 en/user_customization-runtime.ssi:88
-#: en/user_customization-runtime.ssi:116 en/user_customization-runtime.ssi:126
-#: en/user_customization-runtime.ssi:135 en/user_customization-runtime.ssi:152
+#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:21
+#: en/user_customization-runtime.ssi:31 en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:80
+#: en/user_customization-runtime.ssi:89 en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:126 en/user_customization-runtime.ssi:136
+#: en/user_customization-runtime.ssi:145 en/user_customization-runtime.ssi:162
#: 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_examples.ssi:60 en/user_examples.ssi:70 en/user_examples.ssi:88
+#: en/user_examples.ssi:101 en/user_examples.ssi:109 en/user_examples.ssi:117
+#: en/user_examples.ssi:127 en/user_examples.ssi:139 en/user_examples.ssi:151
+#: en/user_examples.ssi:159 en/user_examples.ssi:167 en/user_examples.ssi:175
+#: en/user_examples.ssi:195 en/user_examples.ssi:211 en/user_examples.ssi:219
+#: en/user_examples.ssi:234 en/user_examples.ssi:242 en/user_examples.ssi:262
+#: en/user_examples.ssi:271 en/user_examples.ssi:281 en/user_examples.ssi:299
#: 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:43
+#: en/user_managing_a_configuration.ssi:27
+#: en/user_managing_a_configuration.ssi:42
+#: en/user_managing_a_configuration.ssi:59
+#: en/user_managing_a_configuration.ssi:70
+#: en/user_managing_a_configuration.ssi:78 en/user_overview.ssi:43
#: en/user_overview.ssi:53 en/user_overview.ssi:61
msgid "}code"
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:16 en/user_overview.ssi:51
+#, no-wrap
+msgid " $ lb config --distribution sid\n"
+msgstr ""
+
+#. type: Plain text
#: en/user_overview.ssi:2
msgid ":B~ Overview of tools"
msgstr ""
@@ -282,9 +290,9 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config\n"
-" [2012-03-19 15:17:14] lb_config\n"
+" [2012-08-03 22:59:17] lb_config\n"
" P: Considering defaults defined in /etc/live/build.conf\n"
-" P: Creating config tree for a debian system\n"
+" P: Creating config tree for a debian/i386 system\n"
msgstr ""
#. type: Plain text
@@ -299,14 +307,8 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:47
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:51
-#, no-wrap
-msgid " $ lb config -p gnome\n"
+"Normally, you will want to specify some options. For example, to specify "
+"which distribution you want to build using its codename:"
msgstr ""
#. type: Plain text
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 4844ed5..bf8173d 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: 02-08-2012
+ :published: 06-08-2012
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/project_bugs.ssi b/manual/pt_BR/project_bugs.ssi
index eec3466..264dbba 100644
--- a/manual/pt_BR/project_bugs.ssi
+++ b/manual/pt_BR/project_bugs.ssi
@@ -3,9 +3,9 @@ B~ Reporting bugs
1~bugs Reporting bugs
Debian Live is far from being perfect, but we want to make it as close as
-possible to perfect - with your help. Do not hesitate to report a bug: it is
+possible to perfect - with your help. Do not hesitate to report a bug. It is
better to fill a report twice than never. However, this chapter includes
-recommendations how to file good bug reports.
+recommendations on how to file good bug reports.
For the impatient:
@@ -22,15 +22,15 @@ live-tools used and the distribution of the live system you are building.
2~ Known issues
-Because Debian *{testing}* and Debian *{unstable}* distributions are a
-moving target, when you specify either as the target system distribution, a
-successful build may not always be possible.
+Since Debian *{testing}* and Debian *{unstable}* distributions are moving
+targets, when you specify either of them as the target system distribution,
+a successful build may not always be possible.
% FIXME:
If this causes too much difficulty for you, do not build a system based on
-*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does
-always default to the *{stable}* release.
+*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always
+defaults to the *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage
at http://live.debian.net/.
@@ -56,9 +56,9 @@ up-to-date and any packages included in your image are up-to-date as well.
2~collect-information Collect information
-Please provide enough information with your report. At least include the
-exact version of live-build version where the bug is encountered and steps
-to reproduce it. Please use common sense and include other relevant
+Please provide enough information with your report. Include, at least, the
+exact version of live-build where the bug is encountered and the steps to
+reproduce it. Please use your common sense and provide any other relevant
information if you think that it might help in solving the problem.
To make the most out of your bug report, we require at least the following
@@ -83,7 +83,7 @@ _* Distribution of the live system
_* Version of the kernel on the live system
You can generate a log of the build process by using the #{tee}# command. We
-recommend doing this automatically with an #{auto/build}# script; (see
+recommend doing this automatically with an #{auto/build}# script (see
{Managing a configuration}#managing-a-configuration for details).
code{
@@ -109,9 +109,9 @@ settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or
2~ Isolate the failing case if possible
If possible, isolate the failing case to the smallest possible change that
-breaks. It is not always easy to do this, so if you can't manage it for your
-report, don't worry. However, if you plan your development cycle well, using
-small enough change sets per iteration, you may be able to isolate the
+breaks. It is not always easy to do this so if you cannot manage it for your
+report, do not worry. However, if you plan your development cycle well,
+using small enough change sets per iteration, you may be able to isolate the
problem by constructing a simpler 'base' configuration that closely matches
your actual configuration plus just the broken change set added to it. If
you have a hard time sorting out which of your changes broke, it may be that
@@ -120,12 +120,12 @@ increments.
2~ Use the correct package to report the bug against
-If you don't know what component is responsible for the bug or if the bug is
-a general bug concerning live systems, you can fill a bug against the
+If you do not know what component is responsible for the bug or if the bug
+is a general bug concerning live systems, you can fill a bug against the
debian-live pseudo-package.
-However, we would appreciate if you try to narrow it down according to where
-the bug appears.
+However, we would appreciate it if you try to narrow it down according to
+where the bug appears.
3~ At build time whilst bootstrapping
@@ -133,10 +133,10 @@ live-build first bootstraps a basic Debian system with /{debootstrap}/ or
/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
distribution it is bootstrapping, it may fail. If a bug appears here, check
if the error is related to a specific Debian package (most likely), or if it
-is related to bootstrapping tool itself.
+is related to the bootstrapping tool itself.
In both cases, this is not a bug in Debian Live, but rather in Debian itself
-which we can not fix this directly. Please report such a bug against the
+and probably we cannot fix it directly. Please report such a bug against the
bootstrapping tool or the failing package.
3~ At build time whilst installing packages
@@ -151,31 +151,31 @@ If this is the case, this is not a bug in Debian Live, but rather in Debian
separately from the Live system build or running #{lb bootstrap --debug}#
will give you more information.
-Also, if you are using a local mirror and/or any of sort of proxy and you
-are experiencing a problem, please always reproduce it first by
-bootstrapping from an official mirror.
+Also, if you are using a local mirror and/or any sort of proxy and you are
+experiencing a problem, please always reproduce it first by bootstrapping
+from an official mirror.
3~ At boot time
If your image does not boot, please report it to the mailing list together
with the information requested in {Collect
information}#collect-information. Do not forget to mention, how/when the
-image failed, in Qemu, Virtualbox, VMWare or real hardware. If you are using
-a virtualization technology of any kind, please always run it on real
-hardware before reporting a bug. Providing a screenshot of the failure is
-also very helpful.
+image failed, whether in Qemu, Virtualbox, VMWare or real hardware. If you
+are using a virtualization technology of any kind, please always run it on
+real hardware before reporting a bug. Providing a screenshot of the failure
+is also very helpful.
3~ At run time
If a package was successfully installed, but fails while actually running
-the Live system, this is probably a bug in Debian Live. However,
+the Live system, this is probably a bug in Debian Live. However:
2~ Do the research
Before filing the bug, please search the web for the particular error
message or symptom you are getting. As it is highly unlikely that you are
-the only person experiencing a particular problem, there is always a chance
-that it has been discussed elsewhere, and a possible solution, patch, or
+the only person experiencing a particular problem. There is always a chance
+that it has been discussed elsewhere and a possible solution, patch, or
workaround has been proposed.
You should pay particular attention to the Debian Live mailing list, as well
@@ -185,7 +185,7 @@ in your bug report.
In addition, you should check the current bug lists for live-build,
live-boot, live-config and live-tools to see whether something similar has
-been reported already.
+already been reported.
2~ Where to report bugs
diff --git a/manual/pt_BR/user_customization-contents.ssi b/manual/pt_BR/user_customization-contents.ssi
index e6237cf..fb0ce3b 100644
--- a/manual/pt_BR/user_customization-contents.ssi
+++ b/manual/pt_BR/user_customization-contents.ssi
@@ -14,8 +14,8 @@ installed by supplying answers to debconf questions.
While ideally a Debian live system would include files entirely provided by
unmodified Debian packages, it is sometimes convenient to provide or modify
some content by means of files. Using includes, it is possible to add (or
-replace) arbitrary files in your Debian Live image. live-build provides
-three mechanisms for using them:
+replace) arbitrary files in your Debian Live image. live-build provides two
+mechanisms for using them:
_* Chroot local includes: These allow you to add or replace files to the
chroot/Live filesystem. Please see {Live/chroot local
@@ -25,10 +25,6 @@ _* Binary local includes: These allow you to add or replace files in the
binary image. Please see {Binary local includes}#binary-local-includes for
more information.
-_* Binary includes: These allow you to add or replace Debian specific files
-in the binary image, such as the templates and tools directories. Please see
-{Binary includes}#binary-includes for more information.
-
Please see {Terms}#terms for more information about the distinction between
the "Live" and "binary" images.
@@ -90,21 +86,6 @@ code{
These files will now appear in the root directory of the live media.
-3~binary-includes Binary includes
-
-live-build has some standard files (like documentation) that gets included
-in the default configuration on every live media. This can be disabled with:
-
-code{
-
- $ lb config --includes none
-
-}code
-
-Otherwise, the material will be installed by live-build in #{/includes/}# by
-default on the media filesystem, or else you can specify an alternate path
-with #{--includes}#.
-
2~hooks Hooks
Hooks allow commands to be performed in the chroot and binary stages of the
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 1f93ddf..2b706a5 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -234,7 +234,7 @@ typically use such a list with one of the non-live installer variants. As
mentioned above, if you want this list to be the same as your chroot stage
list, simply use the #{.list}# suffix by itself.
-3~ Generated package lists
+3~generated-package-lists Generated package lists
It sometimes happens that the best way to compose a list is to generate it
with a script. Any line starting with an exclamation point indicates a
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index f506833..df0ccdc 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -79,8 +79,7 @@ code{
$ mkdir tutorial2
$ cd tutorial2
- $ lb config -p lxde
- $ echo iceweasel >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel" >> config/package-lists/my.list.chroot
}code
@@ -133,7 +132,6 @@ code{
lb config noauto \
--architectures i386 \
--linux-flavours 686-pae \
- --package-lists lxde \
"${@}"
}code
@@ -151,15 +149,15 @@ Now populate your local package list:
code{
- $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel xchat" >> config/package-lists/my.list.chroot
}code
First, #{--architectures 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
+much older systems. Third, we have chosen the /{lxde}/ task metapackage to
+give us a minimal desktop. And finally, we have added two initial favourite
packages: /{iceweasel}/ and /{xchat}/.
Now, build the image:
@@ -243,23 +241,27 @@ cases drawn from the collected experiences of users of Debian Live.
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
-Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
-/{xvnc4viewer}/, disabling recommends to make a minimal system:
+Make a build directory and create an skeletal configuration inside it,
+disabling recommends to make a minimal system. And then create two package
+lists: the first one generated with a script provided by live-build named
+#{Packages}# (see {Generated package lists}#generated-package-lists), and
+the second one including /{xorg}/, /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/.
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686-pae -p standard-x11 \
- --apt-recommends false
- $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
+ $ lb config -a i386 -k 686-pae --apt-recommends false
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo "xorg gdm3 metacity xvnc4viewer" > config/package-lists/my.list.chroot
}code
-Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch /{metacity}/ and start /{xvncviewer}/,
-connecting to port #{5901}# on a server at #{192.168.1.2}#:
+Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a
+custom #{.xsession}# in it for the default user that will launch
+/{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a
+server at #{192.168.1.2}#:
code{
@@ -287,22 +289,21 @@ Enjoy.
2~ A base image for a 128M USB key
-*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.
When optimizing an image to fit a certain media size, you need to understand
the tradeoffs you are making between size and functionality. In this
example, we trim only so much as to make room for additional material within
-a 128M media size, but without doing anything to destroy integrity of the
-packages contained within, such as the purging of locale data via the
+a 128M media size, but without doing anything to destroy the integrity of
+the packages contained within, such as the purging of locale data via the
/{localepurge}/ package, or other such "intrusive" optimizations. Of
-particular note, you should not use #{--bootstrap-flavour minimal}# unless
-you really know what you're doing, as omitting priority *{important}*
-packages will most likely produce a broken live system.
+particular note, in order to understand what the #{minimal.chroot}# hook
+does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
}code
@@ -314,23 +315,27 @@ code{
}code
-On the author's system at time of writing, the above configuration produced
-a 78Mbyte image. This compares favourably with the 166Mbyte image produced
-by the default configuration in {Tutorial 1}#tutorial-1.
+On the author's system at the time of writing this, the above configuration
+produced a 95Mbyte image. This compares favourably with the 182Mbyte image
+produced 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-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.
+system. 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. #{--memtest none}# prevents the
+installation of a memory tester. And finally, the execution of the
+#{minimal}# hook removes some unused packages and files.
+
+Using other hooks, like for example the #{stripped.chroot}# hook found in
+#{/usr/share/doc/live-build/examples/hooks}#, may shave off additional small
+amounts of space and produce an image of 76MB. But it is up to you to decide
+if the functionality that is sacrificed with each size optimization is worth
+the loss of functionality.
2~ A localized KDE desktop and installer
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index a79f060..d1e4b47 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -8,87 +8,119 @@ live-build software and the live image itself.
2~ Use auto to manage configuration changes
-Live configurations rarely are perfect on the first try. You'll likely need
-to make a series of revisions until you are satisfied. However,
-inconsistencies can creep into your configuration from one revision to the
-next if you aren't careful. The main problem is, once a variable is given a
-default value, that value will not be recomputed from other variables that
-may change in later revisions.
-
-For example, when the distribution is first set, many 'dependent' variables
-are given default values that suit that distribution. However, if you later
-decide to change the distribution, those dependent variables continue to
-retain old values that are no longer appropriate.
-
-A second, related problem is that if you run #{lb config}# and then upgrade
-to a new version of live-build that has changed one of the variable names,
-you will discover this only by manual review of the variables in your
-#{config/*}# files, which you will then need to use to set the appropriate
-option again.
-
-All of this would be a terrible nuisance if it weren't for auto/* scripts,
-simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
-that are designed to help you manage your configuration. Simply create an
-auto/config script containing #{lb config}# command with all desired
-options, and an auto/clean that removes the files containing configuration
-variable values, and each time you run #{lb config}# and #{lb clean}#, these
-files will be executed. This will ensure that your configuration is kept
-internally consistent from one revision to the next and from one live-build
-release to the next (Although you will still have to take care and read the
-documentation when you upgrade live-build and make adjustments as needed).
-
-2~ Example auto scripts
-
-Use auto script examples such as the following as the starting point for
-your new live-build configuration. Take note that when you call the #{lb}#
-command that the auto script wraps, you must specify #{noauto}# as its
-parameter to ensure that the auto script isn't called again,
-recursively. Also, don't forget to ensure the scripts are executable
-(e.g. #{chmod 755 auto/*}#).
-
-#{auto/config}#
+Live configurations rarely are perfect on the first try. It may be fine to
+pass #{lb config}# options from the command-line to perform a single build,
+but it is more typical to revise those options and build again until you are
+satisfied. To support these changes, you will need auto scripts which ensure
+your configuration is kept in a consistent state.
+
+3~ Why you need auto
+
+The #{lb config}# command stores the options you pass to it in #{config/*}#
+files along with many other options set to default values. If you run #{lb
+config}# again, it will not reset any option that was defaulted based on
+your initial options. So, for example, if you run #{lb config}# again with a
+new value for #{--distribution}#, any dependent options that were defaulted
+for the old distribution may no longer work with the new. Nor are these
+files intended to be read or edited. They store values for over a hundred
+options, so nobody, let alone yourself, will be able to see in these which
+options you actually specified. And finally, if you run #{lb config}#, then
+upgrade live-build and it happens to rename an option, #{config/*}# would
+still contain variables named after the old option that are no longer valid.
+
+For all these reasons, #{auto/*}# scripts will make your life easier. They
+are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}#
+commands that are designed to help you manage your configuration. The
+#{auto/config}# script stores your #{lb config}# command with all desired
+options, the #{auto/clean}# script removes the files containing
+configuration variable values, and the #{auto/build}# script keeps a
+#{build.log}# of each build. Each of these scripts is run automatically
+every time you run the corresponding #{lb}# command. By using these scripts,
+your configuration is easier to read and is kept internally consistent from
+one revision to the next. Also, it will be much easier for you identify and
+fix options which need to change when you upgrade live-build after reading
+the updated documentation.
+
+3~ Use example auto scripts
+
+For your convenience, live-build comes with example auto shell scripts to
+copy and edit. Start a new, default configuration, then copy the examples
+into it:
+
+code{
+
+ $ mkdir mylive && cd mylive && lb config
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
+
+}code
+
+Edit #{auto/config}#, adding any options as you see fit. For instance:
code{
#!/bin/sh
lb config noauto \
- --package-lists "standard" \
+ --architectures i386 \
+ --linux-flavours 686-pae \
+ --binary-images hdd \
+ --mirror-bootstrap http://ftp.es.debian.org/debian/ \
+ --mirror-binary http://ftp.es.debian.org/debian/ \
"${@}"
}code
-#{auto/clean}#
+Now, each time you use #{lb config}#, #{auto/config}# will reset the
+configuration based on these options. When you want to make changes to them,
+edit the options in this file instead of passing them to #{lb config}#. When
+you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files
+along with any other build products. And finally, when you use #{lb build}#,
+a log of the build will be written by #{auto/build}# in #{build.log}#.
+
+Note: A special #{noauto}# parameter is used here to suppress another call
+to #{auto/config}#, thereby preventing infinite recursion. Make sure you
+don't accidentally remove it when making edits. Also, take care to ensure
+when you split the #{lb config}# command across multiple lines for
+readability, as shown in the example above, that you don't forget the
+backslash (\) at the end of each line that continues to the next.
+
+2~ Clone a configuration published via Git
+
+Use the #{lb config --config}# option to clone a Git repository that
+contains a Debian Live configuration. If you would like to base your
+configuration on one maintained by the Debian Live project, look at
+http://live.debian.net/gitweb for the repositories prefixed with
+#{config-}#.
+
+For example, to build a rescue image, use the #{config-rescue}# repository
+as follows:
code{
- #!/bin/sh
- lb clean noauto "${@}"
- rm -f config/binary config/bootstrap \
- config/chroot config/common config/source
- rm -f build.log
+ $ mkdir live-rescue && cd live-rescue
+ $ lb config git://live.debian.net/git/config-rescue.git
}code
-#{auto/build}#
+Edit #{auto/config}# and any other things you need in the #{config}# tree to
+suit your needs.
+
+You may optionally define a shortcut in your Git configuration by adding the
+following to your #{${HOME}/.gitconfig}#:
code{
- #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee build.log
+ [url "git://live.debian.net/git/"]
+ insteadOf = ldn:
}code
-We now ship example auto scripts with live-build based on the examples
-above. You may copy those as your starting point.
+This enables you to use #{ldn:}# anywhere you need to specify the address of
+a #{live.debian.net}# git repository. If you also drop the optional #{.git}#
+suffix, starting a new image using this configuration is as easy as:
code{
- $ cp /usr/share/doc/live-build/examples/auto/* auto/
+ $ lb config ldn:config-rescue
}code
-Edit #{auto/config}#, changing or adding any options as you see fit. In the
-example above, #{--package-lists standard}# is set to the default
-value. Change this to an appropriate value for your image (or delete it if
-you want to use the default) and add any additional options in continuation
-lines that follow.
diff --git a/manual/pt_BR/user_overview.ssi b/manual/pt_BR/user_overview.ssi
index 04578d4..61c653c 100644
--- a/manual/pt_BR/user_overview.ssi
+++ b/manual/pt_BR/user_overview.ssi
@@ -58,9 +58,9 @@ subdirectory which it populates with some default settings, and a skeleton
code{
$ lb config
- [2012-03-19 15:17:14] lb_config
+ [2012-08-03 22:59:17] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree for a debian system
+ P: Creating config tree for a debian/i386 system
}code
@@ -69,12 +69,12 @@ 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).
-Normally, you will want to specify some options. For example, to include the
-'gnome' package list in your configuration:
+Normally, you will want to specify some options. For example, to specify
+which distribution you want to build using its codename:
code{
- $ lb config -p gnome
+ $ lb config --distribution sid
}code
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index b1940ce..01b2458 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Acest program este liber: poate fi redistribuit și/sau modificat în conformitate cu termenii Licenței Publice Generale GNU (GPL), precum este publicată de către Free Software Foundation, fie versiunea 3 a licenței, sau (opțional) orice altă versiune ulterioară..<br><br>Acest program este distribuit cu speranța că va fi util, dar FĂRĂ NICIO GARANȚIE; fără a avea garanția VANDABILITĂȚII sau ÎNDEPLINIRII UNUI ANUME SCOP. Vezi Licența Publică Generală GNU pentru mai multe detalii.<br><br>Ar trebui să fi orimit o copie a Licenței Publice Generale GNU împreună cu acest program. În caz contrar, vezi http://www.gnu.org/licenses/. <br><br>Textul complet al Licenței Publice Generale poate fi găsit în fișierul /usr/share/common-licenses/GPL-3.
@date:
- :published: 02.08.2012
+ :published: 06.08.2012
@publisher: Proiectul Debian Live <debian-live at lists.debian.org>
diff --git a/manual/ro/project_bugs.ssi b/manual/ro/project_bugs.ssi
index eec3466..264dbba 100644
--- a/manual/ro/project_bugs.ssi
+++ b/manual/ro/project_bugs.ssi
@@ -3,9 +3,9 @@ B~ Reporting bugs
1~bugs Reporting bugs
Debian Live is far from being perfect, but we want to make it as close as
-possible to perfect - with your help. Do not hesitate to report a bug: it is
+possible to perfect - with your help. Do not hesitate to report a bug. It is
better to fill a report twice than never. However, this chapter includes
-recommendations how to file good bug reports.
+recommendations on how to file good bug reports.
For the impatient:
@@ -22,15 +22,15 @@ live-tools used and the distribution of the live system you are building.
2~ Known issues
-Because Debian *{testing}* and Debian *{unstable}* distributions are a
-moving target, when you specify either as the target system distribution, a
-successful build may not always be possible.
+Since Debian *{testing}* and Debian *{unstable}* distributions are moving
+targets, when you specify either of them as the target system distribution,
+a successful build may not always be possible.
% FIXME:
If this causes too much difficulty for you, do not build a system based on
-*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build does
-always default to the *{stable}* release.
+*{testing}* or *{unstable}*, but rather, use *{stable}*. live-build always
+defaults to the *{stable}* release.
Currently known issues are listed under the section 'status' on our homepage
at http://live.debian.net/.
@@ -56,9 +56,9 @@ up-to-date and any packages included in your image are up-to-date as well.
2~collect-information Collect information
-Please provide enough information with your report. At least include the
-exact version of live-build version where the bug is encountered and steps
-to reproduce it. Please use common sense and include other relevant
+Please provide enough information with your report. Include, at least, the
+exact version of live-build where the bug is encountered and the steps to
+reproduce it. Please use your common sense and provide any other relevant
information if you think that it might help in solving the problem.
To make the most out of your bug report, we require at least the following
@@ -83,7 +83,7 @@ _* Distribution of the live system
_* Version of the kernel on the live system
You can generate a log of the build process by using the #{tee}# command. We
-recommend doing this automatically with an #{auto/build}# script; (see
+recommend doing this automatically with an #{auto/build}# script (see
{Managing a configuration}#managing-a-configuration for details).
code{
@@ -109,9 +109,9 @@ settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or
2~ Isolate the failing case if possible
If possible, isolate the failing case to the smallest possible change that
-breaks. It is not always easy to do this, so if you can't manage it for your
-report, don't worry. However, if you plan your development cycle well, using
-small enough change sets per iteration, you may be able to isolate the
+breaks. It is not always easy to do this so if you cannot manage it for your
+report, do not worry. However, if you plan your development cycle well,
+using small enough change sets per iteration, you may be able to isolate the
problem by constructing a simpler 'base' configuration that closely matches
your actual configuration plus just the broken change set added to it. If
you have a hard time sorting out which of your changes broke, it may be that
@@ -120,12 +120,12 @@ increments.
2~ Use the correct package to report the bug against
-If you don't know what component is responsible for the bug or if the bug is
-a general bug concerning live systems, you can fill a bug against the
+If you do not know what component is responsible for the bug or if the bug
+is a general bug concerning live systems, you can fill a bug against the
debian-live pseudo-package.
-However, we would appreciate if you try to narrow it down according to where
-the bug appears.
+However, we would appreciate it if you try to narrow it down according to
+where the bug appears.
3~ At build time whilst bootstrapping
@@ -133,10 +133,10 @@ live-build first bootstraps a basic Debian system with /{debootstrap}/ or
/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
distribution it is bootstrapping, it may fail. If a bug appears here, check
if the error is related to a specific Debian package (most likely), or if it
-is related to bootstrapping tool itself.
+is related to the bootstrapping tool itself.
In both cases, this is not a bug in Debian Live, but rather in Debian itself
-which we can not fix this directly. Please report such a bug against the
+and probably we cannot fix it directly. Please report such a bug against the
bootstrapping tool or the failing package.
3~ At build time whilst installing packages
@@ -151,31 +151,31 @@ If this is the case, this is not a bug in Debian Live, but rather in Debian
separately from the Live system build or running #{lb bootstrap --debug}#
will give you more information.
-Also, if you are using a local mirror and/or any of sort of proxy and you
-are experiencing a problem, please always reproduce it first by
-bootstrapping from an official mirror.
+Also, if you are using a local mirror and/or any sort of proxy and you are
+experiencing a problem, please always reproduce it first by bootstrapping
+from an official mirror.
3~ At boot time
If your image does not boot, please report it to the mailing list together
with the information requested in {Collect
information}#collect-information. Do not forget to mention, how/when the
-image failed, in Qemu, Virtualbox, VMWare or real hardware. If you are using
-a virtualization technology of any kind, please always run it on real
-hardware before reporting a bug. Providing a screenshot of the failure is
-also very helpful.
+image failed, whether in Qemu, Virtualbox, VMWare or real hardware. If you
+are using a virtualization technology of any kind, please always run it on
+real hardware before reporting a bug. Providing a screenshot of the failure
+is also very helpful.
3~ At run time
If a package was successfully installed, but fails while actually running
-the Live system, this is probably a bug in Debian Live. However,
+the Live system, this is probably a bug in Debian Live. However:
2~ Do the research
Before filing the bug, please search the web for the particular error
message or symptom you are getting. As it is highly unlikely that you are
-the only person experiencing a particular problem, there is always a chance
-that it has been discussed elsewhere, and a possible solution, patch, or
+the only person experiencing a particular problem. There is always a chance
+that it has been discussed elsewhere and a possible solution, patch, or
workaround has been proposed.
You should pay particular attention to the Debian Live mailing list, as well
@@ -185,7 +185,7 @@ in your bug report.
In addition, you should check the current bug lists for live-build,
live-boot, live-config and live-tools to see whether something similar has
-been reported already.
+already been reported.
2~ Where to report bugs
diff --git a/manual/ro/user_customization-contents.ssi b/manual/ro/user_customization-contents.ssi
index e6237cf..fb0ce3b 100644
--- a/manual/ro/user_customization-contents.ssi
+++ b/manual/ro/user_customization-contents.ssi
@@ -14,8 +14,8 @@ installed by supplying answers to debconf questions.
While ideally a Debian live system would include files entirely provided by
unmodified Debian packages, it is sometimes convenient to provide or modify
some content by means of files. Using includes, it is possible to add (or
-replace) arbitrary files in your Debian Live image. live-build provides
-three mechanisms for using them:
+replace) arbitrary files in your Debian Live image. live-build provides two
+mechanisms for using them:
_* Chroot local includes: These allow you to add or replace files to the
chroot/Live filesystem. Please see {Live/chroot local
@@ -25,10 +25,6 @@ _* Binary local includes: These allow you to add or replace files in the
binary image. Please see {Binary local includes}#binary-local-includes for
more information.
-_* Binary includes: These allow you to add or replace Debian specific files
-in the binary image, such as the templates and tools directories. Please see
-{Binary includes}#binary-includes for more information.
-
Please see {Terms}#terms for more information about the distinction between
the "Live" and "binary" images.
@@ -90,21 +86,6 @@ code{
These files will now appear in the root directory of the live media.
-3~binary-includes Binary includes
-
-live-build has some standard files (like documentation) that gets included
-in the default configuration on every live media. This can be disabled with:
-
-code{
-
- $ lb config --includes none
-
-}code
-
-Otherwise, the material will be installed by live-build in #{/includes/}# by
-default on the media filesystem, or else you can specify an alternate path
-with #{--includes}#.
-
2~hooks Hooks
Hooks allow commands to be performed in the chroot and binary stages of the
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 1f93ddf..2b706a5 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -234,7 +234,7 @@ typically use such a list with one of the non-live installer variants. As
mentioned above, if you want this list to be the same as your chroot stage
list, simply use the #{.list}# suffix by itself.
-3~ Generated package lists
+3~generated-package-lists Generated package lists
It sometimes happens that the best way to compose a list is to generate it
with a script. Any line starting with an exclamation point indicates a
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index e7bc9be..b0c02a1 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -79,8 +79,7 @@ code{
$ mkdir tutorial2
$ cd tutorial2
- $ lb config -p lxde
- $ echo iceweasel >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel" >> config/package-lists/my.list.chroot
}code
@@ -133,7 +132,6 @@ code{
lb config noauto \
--architectures i386 \
--linux-flavours 686-pae \
- --package-lists lxde \
"${@}"
}code
@@ -151,15 +149,15 @@ Now populate your local package list:
code{
- $ echo "iceweasel xchat" >> config/package-lists/my.list.chroot
+ $ echo "task-lxde-desktop iceweasel xchat" >> config/package-lists/my.list.chroot
}code
First, #{--architectures 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
+much older systems. Third, we have chosen the /{lxde}/ task metapackage to
+give us a minimal desktop. And finally, we have added two initial favourite
packages: /{iceweasel}/ and /{xchat}/.
Now, build the image:
@@ -243,23 +241,27 @@ cases drawn from the collected experiences of users of Debian Live.
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
-Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
-/{xvnc4viewer}/, disabling recommends to make a minimal system:
+Make a build directory and create an skeletal configuration inside it,
+disabling recommends to make a minimal system. And then create two package
+lists: the first one generated with a script provided by live-build named
+#{Packages}# (see {Generated package lists}#generated-package-lists), and
+the second one including /{xorg}/, /{gdm3}/, /{metacity}/ and
+/{xvnc4viewer}/.
code{
$ mkdir vnc_kiosk_client
$ cd vnc_kiosk_client
- $ lb config -a i386 -k 686-pae -p standard-x11 \
- --apt-recommends false
- $ echo "gdm3 metacity xvnc4viewer" >> config/package-lists/my.list.chroot
+ $ lb config -a i386 -k 686-pae --apt-recommends false
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo "xorg gdm3 metacity xvnc4viewer" > config/package-lists/my.list.chroot
}code
-Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch /{metacity}/ and start /{xvncviewer}/,
-connecting to port #{5901}# on a server at #{192.168.1.2}#:
+Create the directory #{/etc/skel}# in #{config/includes.chroot}# and put a
+custom #{.xsession}# in it for the default user that will launch
+/{metacity}/ and start /{xvncviewer}/, connecting to port #{5901}# on a
+server at #{192.168.1.2}#:
code{
@@ -287,22 +289,21 @@ Enjoy.
2~ A base image for a 128M USB key
-*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.
+*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with a little space left over to use as you see fit.
When optimizing an image to fit a certain media size, you need to understand
the tradeoffs you are making between size and functionality. In this
example, we trim only so much as to make room for additional material within
-a 128M media size, but without doing anything to destroy integrity of the
-packages contained within, such as the purging of locale data via the
+a 128M media size, but without doing anything to destroy the integrity of
+the packages contained within, such as the purging of locale data via the
/{localepurge}/ package, or other such "intrusive" optimizations. Of
-particular note, you should not use #{--bootstrap-flavour minimal}# unless
-you really know what you're doing, as omitting priority *{important}*
-packages will most likely produce a broken live system.
+particular note, in order to understand what the #{minimal.chroot}# hook
+does you should take a look at #{/usr/share/doc/live-build/examples/hooks}#
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ lb config -k 486 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
}code
@@ -314,23 +315,27 @@ code{
}code
-On the author's system at time of writing, the above configuration produced
-a 78Mbyte image. This compares favourably with the 166Mbyte image produced
-by the default configuration in {Tutorial 1}#tutorial-1.
+On the author's system at the time of writing this, the above configuration
+produced a 95Mbyte image. This compares favourably with the 182Mbyte image
+produced 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-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.
+system. 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. #{--memtest none}# prevents the
+installation of a memory tester. And finally, the execution of the
+#{minimal}# hook removes some unused packages and files.
+
+Using other hooks, like for example the #{stripped.chroot}# hook found in
+#{/usr/share/doc/live-build/examples/hooks}#, may shave off additional small
+amounts of space and produce an image of 76MB. But it is up to you to decide
+if the functionality that is sacrificed with each size optimization is worth
+the loss of functionality.
2~ A localized KDE desktop and installer
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index a79f060..d1e4b47 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -8,87 +8,119 @@ live-build software and the live image itself.
2~ Use auto to manage configuration changes
-Live configurations rarely are perfect on the first try. You'll likely need
-to make a series of revisions until you are satisfied. However,
-inconsistencies can creep into your configuration from one revision to the
-next if you aren't careful. The main problem is, once a variable is given a
-default value, that value will not be recomputed from other variables that
-may change in later revisions.
-
-For example, when the distribution is first set, many 'dependent' variables
-are given default values that suit that distribution. However, if you later
-decide to change the distribution, those dependent variables continue to
-retain old values that are no longer appropriate.
-
-A second, related problem is that if you run #{lb config}# and then upgrade
-to a new version of live-build that has changed one of the variable names,
-you will discover this only by manual review of the variables in your
-#{config/*}# files, which you will then need to use to set the appropriate
-option again.
-
-All of this would be a terrible nuisance if it weren't for auto/* scripts,
-simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
-that are designed to help you manage your configuration. Simply create an
-auto/config script containing #{lb config}# command with all desired
-options, and an auto/clean that removes the files containing configuration
-variable values, and each time you run #{lb config}# and #{lb clean}#, these
-files will be executed. This will ensure that your configuration is kept
-internally consistent from one revision to the next and from one live-build
-release to the next (Although you will still have to take care and read the
-documentation when you upgrade live-build and make adjustments as needed).
-
-2~ Example auto scripts
-
-Use auto script examples such as the following as the starting point for
-your new live-build configuration. Take note that when you call the #{lb}#
-command that the auto script wraps, you must specify #{noauto}# as its
-parameter to ensure that the auto script isn't called again,
-recursively. Also, don't forget to ensure the scripts are executable
-(e.g. #{chmod 755 auto/*}#).
-
-#{auto/config}#
+Live configurations rarely are perfect on the first try. It may be fine to
+pass #{lb config}# options from the command-line to perform a single build,
+but it is more typical to revise those options and build again until you are
+satisfied. To support these changes, you will need auto scripts which ensure
+your configuration is kept in a consistent state.
+
+3~ Why you need auto
+
+The #{lb config}# command stores the options you pass to it in #{config/*}#
+files along with many other options set to default values. If you run #{lb
+config}# again, it will not reset any option that was defaulted based on
+your initial options. So, for example, if you run #{lb config}# again with a
+new value for #{--distribution}#, any dependent options that were defaulted
+for the old distribution may no longer work with the new. Nor are these
+files intended to be read or edited. They store values for over a hundred
+options, so nobody, let alone yourself, will be able to see in these which
+options you actually specified. And finally, if you run #{lb config}#, then
+upgrade live-build and it happens to rename an option, #{config/*}# would
+still contain variables named after the old option that are no longer valid.
+
+For all these reasons, #{auto/*}# scripts will make your life easier. They
+are simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}#
+commands that are designed to help you manage your configuration. The
+#{auto/config}# script stores your #{lb config}# command with all desired
+options, the #{auto/clean}# script removes the files containing
+configuration variable values, and the #{auto/build}# script keeps a
+#{build.log}# of each build. Each of these scripts is run automatically
+every time you run the corresponding #{lb}# command. By using these scripts,
+your configuration is easier to read and is kept internally consistent from
+one revision to the next. Also, it will be much easier for you identify and
+fix options which need to change when you upgrade live-build after reading
+the updated documentation.
+
+3~ Use example auto scripts
+
+For your convenience, live-build comes with example auto shell scripts to
+copy and edit. Start a new, default configuration, then copy the examples
+into it:
+
+code{
+
+ $ mkdir mylive && cd mylive && lb config
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
+
+}code
+
+Edit #{auto/config}#, adding any options as you see fit. For instance:
code{
#!/bin/sh
lb config noauto \
- --package-lists "standard" \
+ --architectures i386 \
+ --linux-flavours 686-pae \
+ --binary-images hdd \
+ --mirror-bootstrap http://ftp.es.debian.org/debian/ \
+ --mirror-binary http://ftp.es.debian.org/debian/ \
"${@}"
}code
-#{auto/clean}#
+Now, each time you use #{lb config}#, #{auto/config}# will reset the
+configuration based on these options. When you want to make changes to them,
+edit the options in this file instead of passing them to #{lb config}#. When
+you use #{lb clean}#, #{auto/clean}# will clean up the #{config/*}# files
+along with any other build products. And finally, when you use #{lb build}#,
+a log of the build will be written by #{auto/build}# in #{build.log}#.
+
+Note: A special #{noauto}# parameter is used here to suppress another call
+to #{auto/config}#, thereby preventing infinite recursion. Make sure you
+don't accidentally remove it when making edits. Also, take care to ensure
+when you split the #{lb config}# command across multiple lines for
+readability, as shown in the example above, that you don't forget the
+backslash (\) at the end of each line that continues to the next.
+
+2~ Clone a configuration published via Git
+
+Use the #{lb config --config}# option to clone a Git repository that
+contains a Debian Live configuration. If you would like to base your
+configuration on one maintained by the Debian Live project, look at
+http://live.debian.net/gitweb for the repositories prefixed with
+#{config-}#.
+
+For example, to build a rescue image, use the #{config-rescue}# repository
+as follows:
code{
- #!/bin/sh
- lb clean noauto "${@}"
- rm -f config/binary config/bootstrap \
- config/chroot config/common config/source
- rm -f build.log
+ $ mkdir live-rescue && cd live-rescue
+ $ lb config git://live.debian.net/git/config-rescue.git
}code
-#{auto/build}#
+Edit #{auto/config}# and any other things you need in the #{config}# tree to
+suit your needs.
+
+You may optionally define a shortcut in your Git configuration by adding the
+following to your #{${HOME}/.gitconfig}#:
code{
- #!/bin/sh
- lb build noauto "${@}" 2>&1 | tee build.log
+ [url "git://live.debian.net/git/"]
+ insteadOf = ldn:
}code
-We now ship example auto scripts with live-build based on the examples
-above. You may copy those as your starting point.
+This enables you to use #{ldn:}# anywhere you need to specify the address of
+a #{live.debian.net}# git repository. If you also drop the optional #{.git}#
+suffix, starting a new image using this configuration is as easy as:
code{
- $ cp /usr/share/doc/live-build/examples/auto/* auto/
+ $ lb config ldn:config-rescue
}code
-Edit #{auto/config}#, changing or adding any options as you see fit. In the
-example above, #{--package-lists standard}# is set to the default
-value. Change this to an appropriate value for your image (or delete it if
-you want to use the default) and add any additional options in continuation
-lines that follow.
diff --git a/manual/ro/user_overview.ssi b/manual/ro/user_overview.ssi
index 04578d4..61c653c 100644
--- a/manual/ro/user_overview.ssi
+++ b/manual/ro/user_overview.ssi
@@ -58,9 +58,9 @@ subdirectory which it populates with some default settings, and a skeleton
code{
$ lb config
- [2012-03-19 15:17:14] lb_config
+ [2012-08-03 22:59:17] lb_config
P: Considering defaults defined in /etc/live/build.conf
- P: Creating config tree for a debian system
+ P: Creating config tree for a debian/i386 system
}code
@@ -69,12 +69,12 @@ 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).
-Normally, you will want to specify some options. For example, to include the
-'gnome' package list in your configuration:
+Normally, you will want to specify some options. For example, to specify
+which distribution you want to build using its codename:
code{
- $ lb config -p gnome
+ $ lb config --distribution sid
}code
--
live-manual
More information about the debian-live-changes
mailing list