[SCM] live-manual branch, upstream, updated. upstream/3.0_a14-1-gafefe02
Daniel Baumann
daniel at debian.org
Sat Aug 11 08:19:23 UTC 2012
The following commit has been merged in the upstream branch:
commit afefe02e96efdffb1d5a56ae1659c587489913d3
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Aug 10 22:51:49 2012 +0200
Adding upstream version 3.0~a15.
diff --git a/VERSION b/VERSION
index 2791e1e..d29bb27 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a14-1
+3.0~a15-1
diff --git a/manual/bin/po-integrity-check.sh b/manual/bin/po-integrity-check.sh
index d36bc35..8c4491a 100755
--- a/manual/bin/po-integrity-check.sh
+++ b/manual/bin/po-integrity-check.sh
@@ -25,8 +25,7 @@ Integrity_check()
echo ""
for POFILE in manual/po/${LANGUAGE}/*
do
- echo "-$(basename ${POFILE})"
- echo ""
+ echo "-$(basename ${POFILE})"
msgfmt --verbose --check --output-file=/dev/null ${POFILE} || { echo "-> This .po file might be 'BAD'. Please revise it."; echo ""; exit 1; }
if [ "$?" -eq "0" ]
then
@@ -52,8 +51,7 @@ case "$LANGUAGE" in
do
for POFILE in ${LANGUAGE}/*
do
- echo "-Checking $(basename ${POFILE}) integrity in ${LANGUAGE}"
- echo ""
+ echo "-Checking the integrity of $(basename ${POFILE}) in ${LANGUAGE}"
msgfmt --verbose --check --output-file=/dev/null ${POFILE} || { echo "-> This .po file might be 'BAD'. Please revise it."; echo ""; exit 1; }
if [ "$?" -eq "0" ]
then
diff --git a/manual/ca/live-manual.ssm b/manual/ca/live-manual.ssm
index 7b8faff..5f1348f 100644
--- a/manual/ca/live-manual.ssm
+++ b/manual/ca/live-manual.ssm
@@ -9,13 +9,13 @@
:license: Aquest programa és un programari lliure: es pot redistribuir i/o modificar sota els termes de la Llicència Pública General de la GNU com és publicada per la Free Software Foundation, ja sigui la versió 3 de la Llicència, o (si ho preferiu) qualsevol versió posterior.<br><br>Aquest programa es distribueix amb l'esperança que sigui útil, però sense cap garantia, fins i tot sense la garantia implícita de COMERCIALITZACIÓ o ADEQUACIÓ PER A PROPÒSITS DETERMINATS. Vegeu la Llicència General Pública de la GNU per a més detalls.<br><br>Haurieu de rebre una còpia de la Llicència Pública General de la GNU amb aquest programa. Si no és així, consulteu http://www.gnu.org/licenses/. <br><br>El text complet de la Llicència Pública General de la GNU es pot trobar a /usr/share/common-licenses/GPL-3.
@date:
- :published: 2012-07-27
+ :published: 2012-08-10
@publisher: Projecte Debian Live <debian-live at lists.debian.org>
@make:
- :bold: /squeeze|wheezy|sid/
- :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|jessie|sid/
+ :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
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/style_guide.ssi b/manual/ca/style_guide.ssi
index 4be5827..811b601 100644
--- a/manual/ca/style_guide.ssi
+++ b/manual/ca/style_guide.ssi
@@ -327,20 +327,12 @@ that they use exactly the same markup as the original English version.
_* /{Code blocks}/
-Some translators decide to include the code blocks in the translated files
-because it is easier for them to identify what has already been translated
-and what has not by looking at the percentages if they use a graphical
-translation program.
-
-Include the code blocks if you want to score a 100% complete translation.
-
-On the other hand some translators prefer to leave the code blocks
-"untranslated" (i.e. not including them). This makes the translation easier
-to maintain once finished because it does not require translators
-intervention if the code changes.
-
-Leave the code blocks empty (they will be automatically added then) if you
-want to make your translation easier to maintain.
+Even though the code blocks are usually untranslatable, including them in
+the translation is the only way to score a 100% complete translation. And
+even though it means more work at first because it requires the intervention
+of the translators if the code changes, it is the best way, in the long run,
+to identify what has already been translated and what has not when checking
+the integrity of the .po files.
_* /{Newlines}/
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 61157af..3938e9e 100644
--- a/manual/ca/user_customization-packages.ssi
+++ b/manual/ca/user_customization-packages.ssi
@@ -11,15 +11,15 @@ paquets que estan disponibles per ser instaŀlats en la imatge són les àrees
de distribució i el arxiu. Per garantir velocitats de descàrrega decents,
s'ha de triar un mirall de distribució proper. També es pot incloure
repositoris de backports, paquets experimentals o personalitzats, o incloure
-paquets directament com si fossin fitxers. Es poden definir llistes pròpies
-de paquets, utilitzar llistes predefinides, utilitzar tasques de
-/{tasksel}/, o una combinació d'aquests tres mètodes. Finalment, una sèrie
-d'opcions donen un cert control sobre /{apt}/ o si es prefereix
-/{aptitude}/, quan s'instaŀlen els paquets durant la construcció. Això pot
-ser útil si s'utilitza un proxy, es vol desactivar la instaŀlació de paquets
-recomanats per estalviar espai, o hi ha la necessitat de controlar quines
-versions dels paquets s'instaŀlen mitjançant la tècnica pinning d'APT, per
-nomenar algunes possibilitats.
+paquets directament com si fossin fitxers. Es poden definir llistes de
+paquets, incloent-hi els metapaquets que instaŀlaran diversos paquets
+relacionats alhora, com ara paquets per a un ordinador d'escriptori o un
+llenguatge en particular. Finalment, una sèrie d'opcions donen un cert
+control sobre /{apt}/ o si es prefereix /{aptitude}/, quan s'instaŀlen els
+paquets durant la construcció. Això pot ser útil si s'utilitza un proxy, es
+vol desactivar la instaŀlació de paquets recomanats per estalviar espai, o
+hi ha la necessitat de controlar quines versions dels paquets s'instaŀlen
+mitjançant la tècnica pinning d'APT, per nomenar algunes possibilitats.
2~ Fonts dels paquets
@@ -160,47 +160,78 @@ code{
Hi ha una sèrie de formes de triar els paquets que live-build instaŀlarà en
la imatge, que abasta una varietat de necessitats diferents. Es pot
simplement anomenar paquets individualment per instaŀlar en una llista de
-paquets. També es pot optar per llistes predefinides de paquets, o utilitzar
-les tasques d'APT. I, finalment, es poden coŀlocar paquets com si fossin
-fitxers dins del arbre #{config/}#, que és un mètode que s'adapta
-perfectament a fer proves amb paquets nous o experimentals abans de
-afegirlos a un repositori.
+paquets. També es pot optar per utilitzar metapaquets a les llistes, o
+seleccionar-los utilitzant camps de control de fitxers de paquets. I,
+finalment, es poden copiar paquets com si fossin fitxers dins del arbre
+#{config/}#, que és un mètode que s'adapta perfectament a fer proves amb
+paquets nous o experimentals abans de afegirlos a un repositori.
3~package-lists Llistes de paquets
Les llistes de paquets són una forma eficaç d'expressar quins paquets han de
ser instaŀlats. La sintaxi de la llista suporta els fitxers inclosos i
seccions condicionals que fa que sigui fàcil de construir llistes a partir
-d'altres llistes i adaptar-ler per al propi ús en múltiples
-configuracions. Es poden utilitzar llistes predefinides de paquets,
-proporcionant una selecció de paquets de forma modular de cada un dels
-principals entorns d'escriptori i algunes llistes per a fins especials, així
-com llistes estàndard a partir de les que es basen altres. També es pot
-proporcionar llistes pròpies de paquets, o utilitzar una combinació
-d'ambdós.
+d'altres llistes i adaptar-les per al propi ús en múltiples
+configuracions. Els noms dels paquets també poden ser injectats a la llista
+amb els ajudants de shell en temps de construcció.
*{Nota:}* El comportament de live-build a l'hora d'especificar un paquet que no existeix està determinat per la elecció que es faci de l'eina APT. Veure {Elegir apt or aptitude}#choosing-apt-or-aptitude per més detalls.
-3~ Llistes predefinides de paquets
+3~using-metapackages Using metapackages
-La forma més senzilla d'utilitzar les llistes consisteix a especificar una o
-més llistes predefinides amb l'opció #{--package-lists}#. Per exemple:
+La forma més senzilla per omplir la llista de paquets és utilitzar una tasca
+metapaquet mantinguda per una distribució. Per exemple:
code{
- $ lb config --package-lists "gnome rescue"
+ $ lb config
+ $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot
+
+}code
+
+Això reemplaça l'antic mètode de llistes predefinides de #{live-build}#
+2.x. A diferència de les llistes predefinides, els metapaquets no són
+específics del projecte Debian Live. Per contra, són mantingudes per grups
+d'especialistes que treballen dins la distribució i per tant, reflecteixen
+el consens de cada grup sobre els paquets que serviran millor a les
+necessitats dels usuaris. A més, abasten una gamma molt més àmplia de casos
+d'ús que les llistes predefinides que substitueixen.
+
+Tots els metapaquets tenen el prefix #{task-}#, de manera que una forma
+ràpida de determinar quins estan disponibles (encara que pot contenir un
+grapat d'entrades falses que coincideixin amb el nom, però que no són
+metapaquets) és fer coincidir el nom del paquet amb:
+
+code{
+
+ $ apt-cache search --names-only ^task-
}code
-La ubicació per defecte de les llistes en el sistema és
-#{/usr/share/live/build/package-lists/}#. Per determinar els paquets en una
-llista donada, llegir el fitxer corresponent, prestant atenció als fitxers
-inclosos i els condicionals com es descriu a les següents seccions.
+A més d'aquests, es troben altres metapaquets amb diverses
+finalitats. Alguns són subconjunts de paquets de tasques més àmplies, com
+#{gnome-core}#, mentre que altres són parts individuals especialitzades de
+un Debian Pure Blend, com els metapaquets #{education-*}#. Per a una llista
+de tots els metapaquets a l'arxiu, instaŀlar el paquet #{debtags}# i llistar
+tots els paquets amb l'etiqueta #{role::metapackage}# de la següent manera:
+
+code{
+
+ $ debtags search role::metapackage
+
+}code
3~ Llistes locals de paquets
-Es poden completar les llistes predefinides mitjançant les llistes locals de
-paquets emmagatzemades a #{config/package-lists/}#.
+Ja sigui afegint metapaquets a una llista, paquets individuals, o una
+combinació d'ambdós, totes les llistes de paquets locals s'emmagatzemen a
+#{config/package-lists/}#. Ja que es pot utilitzar més d'una llista, això es
+presta molt bé als dissenys modulars. Per exemple, es pot decidir dedicar
+una llista a una elecció particular d'escriptori, l'altra a una coŀlecció de
+paquets relacionats que puguin ser fàcilment utilitzats al damunt d'un
+escriptori diferent. Això permet experimentar amb diferents combinacions de
+conjunts de paquets amb un mínim d'esforç, intercanviant llistes comunes
+entre els diferents projectes d'imatges en viu.
Les llistes de paquets que es troben en aquest directori han de tenir el
sufix #{.list}# per ser processades, i a més a més un sufix d'etapa
@@ -219,21 +250,25 @@ 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~ Ampliació d'una llista mitjançant includes
+3~generated-package-lists Generar llistes de paquets
-Les llistes de paquets que s'inclouen amb live-build fan un ús extensiu dels
-includes. Es poden consultar al directori
-#{/usr/share/live/build/package-lists/}# ja que serveixen com a bons
-exemples de com escriure llistes pròpies.
+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 produir una llista
+ordenada de paquets disponibles amb #{Priority: standard}#.
-Per exemple, per fer una llista que inclogui la llista predefinida #{gnome}#
-més /{iceweasel}/, crear #{config/package-lists/my.list.chroot}# amb el
-contingut:
+De fet, la selecció de paquets amb l'ordre #{grep-aptavail}# (del paquet
+#{dctrl-tools}#) és tan útil que #{live-build}# proporciona un script
+#{Packages}# d'ajuda per motius de comoditat. Aquest script accepta dos
+arguments: #{field}# and #{pattern}#. Per tant, pot crear una llista amb els
+següents continguts:
code{
- #include <gnome>
- iceweasel
+ $ lb config
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
}code
@@ -294,28 +329,6 @@ code{
No és possible el anidament dels condicionals.
-3~ Tasques
-
-L'instaŀlador de Debian ofereix al usuari opcions d'una sèrie de llistes de
-paquets preseleccionats, cadascuna centrada en un tipus particular de
-sistema, o una tasca per a la qual es pot utilitzar un sistema, com
-"Graphical desktop environment", "Mail server" o "Laptop". Aquestes llistes
-es diuen "tasks" (tasques) i son suportades per APT a través de l'opció
-"Task:" es poden especificar una o més tasques a live-build posant-les en
-una llista a #{config/task-lists/}#, com en l'exemple següent.
-
-code{
-
- $ lb config
- $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
-
-}code
-
-Es poden llistar les principals tasques disponibles al instaŀlador de Debian
-amb #{tasksel --list-tasks}# al sistema viu. El contingut de qualsevol
-tasca, fins i tot les no estan incloses en aquesta llista, poden ser
-examinades amb #{tasksel --task-packages}#.
-
3~desktop-and-language-tasks Tasques d'escriptori i llenguatge
Les tasques d'escriptori i el llenguatge són casos especials que necessiten
@@ -338,36 +351,20 @@ viu no es pugui construir per donar suport a diversos equips d'escriptori o
diversos idiomes i oferir a l'usuari una opció, però això no és el
comportament de live-build per defecte.
-Com que no hi ha cap ajust automàtic per les tasques de llengua que
-incloguin coses com ara fonts específiques per a una llengua o paquets de
-mètode d'entrada, si es vol, cal especificar-ho en la configuració. Per
-exemple, una imatge d'escriptori GNOME que contingui suport per al japonés
-podrie incloure les següents tasques:
+Because there is no provision made automatically for language tasks, which
+include such things as language-specific fonts and input-method packages, if
+you want them, you need to specify them in your configuration. For example,
+a GNOME desktop image containing support for Japanese might include these
+task metapackages:
code{
$ lb config
- $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
- $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
+ $ echo "task-gnome-desktop task-laptop" >> config/package-lists/my.list.chroot
+ $ echo "task-japanese task-japanese-desktop task-japanese-gnome-desktop" >> config/package-lists/my.list.chroot
}code
-Com les tasques d'escriptori són "internes" per a cada tasca d'escriptori
-inclosa en la imatge, el valor corresponent, si aquest és diferent del valor
-per defecte, "gnome", s'ha de fer servir la variable de preconfiguració
-"tasksel/desktop" o en cas contrari tasksel no la reconeixerà i no la
-instaŀlarà. Així:
-
-code{
-
- $ lb config
- $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
-
-}code
-
-Aquest paràmetre pot tenir diversos valors, per exemple "lxde xfce" en lloc
-de "kde".
-
2~installing-modified-or-third-party-packages Instaŀlació de paquets
modificats o de tercers
@@ -482,7 +479,7 @@ code{
}code
-3~ Afinar APT per estalviar espai
+3~tweaking-apt-to-save-space Tweaking APT to save space
Pot ser necessari estalviar espai en els medis destinats a la imatge, en
aquest cas una o altra o ambdós de les següentes opcions poden ser
@@ -503,8 +500,9 @@ sistema en viu, així que abans d'executar per exemple #{apt-cache search}# o
#{apt-get install}#, l'usuari primer ha fer un #{apt-get update}# per crear
aquests índexs.
-Si es considera que la instaŀlació de tots els paquets recomanats infla
-massa la imatge, es pot desactivar aquesta opció per defecte d'APT amb:
+If you find the installation of recommended packages bloats your image too
+much, provided you are prepared to deal with the consequences discussed
+below, you may disable that default option of APT with:
code{
@@ -512,18 +510,27 @@ code{
}code
-El desavantatge aquí és que si no s'instaŀlen els paquets recomanats per un
-paquet determinat, és a dir, "els paquets que es troben junts amb aquest en
-totes les instaŀlacions a menys que siguin inusuals" (Debian Policy Manual,
-secció 7.2), els paquets que en realitat són necessaris poden ser
-omesos. Per tant, suggerim revisar la diferència que desactivar els paquets
-recomanats té en la llista de paquets (veure el fitxer #{binary.packages}#
-generat per #{lb build}#) i tornar a incloure a la llista els paquets que
-falten que haurien de ser instaŀlats. D'altra banda, si només es vol un
-petit nombre de paquets recomanats deixats de banda, es pot deixar els
-paquets recomanats activat i establir una prioritat pin d'APT negativa en
-els paquets seleccionats per impedir la seva instaŀlació, com s'explica a
-{APT pinning}#apt-pinning.
+The most important consequence of turning off recommends is that
+#{live-boot}# and #{live-config}# themselves recommend some packages that
+provide important functionality used by most Live configurations, such as
+#{user-setup}# which #{live-config}# recommends and is used to create the
+live user. In all but the most exceptional circumstances you need to add
+back at least some of these recommends to your package lists or else your
+image will not work as expected, if at all. Look at the recommended packages
+for each of the #{live-*}# packages included in your build and if you are
+not certain you can omit them, add them back into your package lists.
+
+The more general consequence is that if you don't install recommended
+packages for any given package, that is, "packages that would be found
+together with this one in all but unusual installations" (Debian Policy
+Manual, section 7.2), some packages that users of your Live system actually
+need may be omitted. Therefore, we suggest you review the difference turning
+off recommends makes to your packages list (see the #{binary.packages}# file
+generated by #{lb build}#) and re-include in your list any missing packages
+that you still want installed. Alternatively, if you find you only want a
+small number of recommended packages left out, leave recommends enabled and
+set a negative APT pin priority on selected packages to prevent them from
+being installed, as explained in {APT pinning}#apt-pinning.
3~ Passar opcions per a apt o aptitude
@@ -572,10 +579,11 @@ $ lb config --distribution wheezy
Una prioritat pin negativa evitarà que un paquet s'instaŀli, com en el cas
que no es vulgui un paquet que és recomanat per un altre paquet. Suposem que
-s'està construint una imatge LXDE amb #{--package-lists lxde}# però no es
-desitja que al usuari se li demani que guardi les contrasenyes wifi al
-clauer. Aquesta llista inclou /{gdm}/, que depèn de /{gksu}/, que al seu
-torn recomana /{gnome-keyring}/. Si es vol omitir el paquet recomanat
+s'està construint una imatge LXDE afegint #{task-lxde-desktop}# a
+#{config/package-lists/lxde-desktop.list.chroot}# però no es desitja que al
+usuari se li demani que guardi les contrasenyes wifi al clauer. Aquesta
+llista depèn de /{lxde-core}/, que recomana /{gksu}/, que al seu torn
+recomana /{gnome-keyring}/. Si es vol omitir el paquet recomanat
/{gnome-keyring}/ això es pot fer mitjançant l'addició de les següents
línies al #{config/chroot_apt/preferences}#:
diff --git a/manual/ca/user_customization-runtime.ssi b/manual/ca/user_customization-runtime.ssi
index 47d89df..55aad83 100644
--- a/manual/ca/user_customization-runtime.ssi
+++ b/manual/ca/user_customization-runtime.ssi
@@ -1,24 +1,26 @@
-:B~ Customizing run time behaviours
+:B~ Personalització dels comportaments en temps d'execució
-1~customizing-run-time-behaviours Customizing run time behaviours
+1~customizing-run-time-behaviours Personalització dels comportaments en
+temps d'execució
-All configuration that is done during run time is done by live-config. Here
-are some of the most common options of live-config that users are interested
-in. A full list of all possibilities can be found in the manpage of
-live-config.
+Tota la configuració que es fa durant l'execució es feta per
+live-config. Aquestes són algunes de les opcions més comunes de live-config
+en que els usuaris estan interessats. Una llista completa de totes les
+possibilitats es poden trobar a la pàgina del manual de live-config.
-2~ Customizing the live user
+2~ Personalitzar l'usuari en viu
-One important consideration is that the live user is created by live-boot at
-boot time, not by live-build at build time. This not only influences where
-materials relating to the live user are introduced in your build, as
-discussed in {Live/chroot local includes}#live-chroot-local-includes, but
-also any groups and permissions associated with the live user.
+Una consideració important és que l'usuari en viu es creat per live-boot
+durant l'arrencada i no per live-build en temps de construcció. Això
+influeix no només en on s'han de introduir els materials relacionats amb
+l'usuari durant la construcció, tal i com es va explicar a {Live/chroot
+local includes}#live-chroot-local-includes, sinó també en els grups i els
+permisos associats amb l'usuari.
-You can specify additional groups that the live user will belong to by
-preseeding the #{passwd/user-default-groups}# debconf value. For example, to
-add the live user to the #{fuse}# group, add the following preseed under
-#{config/preseed/}# for the chroot stage:
+Es pot especificar grups addicionals als que pertanyerà l'usuari en viu fent
+una preconfiguració (preseed) prèvia del valor debconf
+#{passwd/user-default-groups}#. Per exemple, per afegir l'usuari en viu al
+grup #{fuse}#, afegir la següent configuració preseed a l'etapa chroot:
code{
@@ -29,11 +31,12 @@ code{
}code
-It is also possible to change the default username "user" and the default
-password "live". If you want to do that for any reason, you can easily
-achieve it as follows:
+També és possible canviar el nom d'usuari per defecte "user" i la
+contrasenya per defecte "live". Si es vol fer això per alguna raó, es pot
+aconseguir fàcilment de la següent manera:
-To change the default username you can simply specify it in your config:
+Per canviar el nom d'usuari per defecte només s'ha d'especificar en la
+configuració:
code{
@@ -41,24 +44,26 @@ code{
}code
-One possible way of changing the default password is by means of a hook as
-described in {Boot-time hooks}#boot-time-hooks. In order to do that you can
-use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#,
-prefix it accordingly (e.g. 2000-passwd) and add it to
+Una forma possible de canviar la contrasenya per defecte és per mitjà d'un
+ganxo com s'explica a {Scripts ganxo durant
+l'arrencada}#boot-time-hooks. Per fer això, es pot utilitzar el script ganxo
+"passwd" de #{/usr/share/doc/live-config/examples/hooks}#, posar-li un
+prefix adequat (per exemple 2000-passwd) i afegir-lo a
#{config/includes.chroot/lib/live/config/}#
-2~customizing-locale-and-language Customizing locale and language
+2~customizing-locale-and-language Personalització de l'entorn local i el
+llenguatge
-When the live system boots, language is involved in two steps:
+Quan el sistema en viu arrenca, el llenguatge està implicat en dos passos:
-_* the locale generation
+_* la generació de locales
-_* setting the keyboard configuration
+_* establir la configuració del teclat
-The default locale when building a Live system is
-#{locales=en_US.UTF-8}#. To define the locale that should be generated, use
-the #{locales}# parameter in the #{--bootappend-live}# option of #{lb
-config}#, e.g.
+L'entorn local per omissió en la construcció d'un sistema viu és
+#{locales=en_US.UTF-8}#. Per definir la configuració regional que s'ha de
+generar, utilitzar el paràmetre #{locales}# de la opció
+#{--bootappend-live}# de #{lb config}#, per exemple.
code{
@@ -66,22 +71,24 @@ code{
}code
-Multiple locales may be specified as a comma-delimited list.
-
-This parameter, as well as the keyboard configuration parameters indicated
-below, can also be used at the kernel command line. You can specify a locale
-by #{language_country}# (in which case the default encoding is used) or the
-full #{language_country.encoding}# word. A list of supported locales and the
-encoding for each can be found in #{/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-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:
+Es poden especificar diverses locales en una llista separada per comes.
+
+Aquest paràmetre, així com els paràmetres de configuració del teclat que
+s'indican a continuació, també es pot utilitzar en la línia d'ordres del
+nucli. Es pot especificar una configuració regional mitjançant
+#{language_country}# (en aquest cas s'utilitza la codificació per defecte) o
+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}#.
+
+#{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{
@@ -98,11 +105,12 @@ $ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
}code
-Note that each variant lists the layout to which it applies in the
-description.
+Tinir en compte que cada variant mostra la distribució que s'aplica en la
+descripció.
-Often, only the layout needs to be configured. For example, to get the
-locale files for German and Swiss German keyboard layout in X use:
+Sovint, només la distribució necessita ser configurada. Per exemple, per
+obtenir els fitxers de configuració regional per a la distribució del teclat
+alemany i suís-alemany per l'entorn gràfic X:
code{
@@ -110,81 +118,88 @@ code{
}code
-However, for very specific use cases, you may wish to include other
-parameters. For example, to set up a French system with a French-Dvorak
-layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
+No obstant això, per als casos d'ús molt específics, potser es vol incloure
+altres paràmetres. Per exemple, per establir un sistema francès, amb un una
+distribució de teclat French-Dvorak (anomenat Bepo) en un teclat USB
+TypeMatrix EZ-Reach 2030, utilitzar:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
}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-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:
+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{
$ lb config --bootappend-live \
- "keyboard-layouts=us,us keyboard-variant=,dvorak"
+ "keyboard-layouts=us,us keyboard-variants=,dvorak"
}code
-2~persistence Persistence
-
-A live cd paradigm is a pre-installed system which runs from read-only
-media, like a cdrom, where writes and modifications do not survive reboots
-of the host hardware which runs it.
-
-A Debian Live system is a generalization of this paradigm and thus supports
-other media in addition to CDs; but still, in its default behaviour, it
-should be considered read-only and all the run-time evolutions of the system
-are lost at shutdown.
-
-'Persistence' is a common name for different kinds of solutions for saving
-across reboots some, or all, of this run-time evolution of the system. To
-understand how it works it would be handy to know that even if the system is
-booted and run from read-only media, modifications to the files and
-directories are written on writable media, typically a ram disk (tmpfs) and
-ram disks' data do not survive reboots.
-
-The data stored on this ramdisk should be saved on a writable persistent
-medium like local storage media, a network share or even a session of a
-multisession (re)writable CD/DVD. All these media are supported in Debian
-Live in different ways, and all but the last one require a special boot
-parameter to be specified at boot time: #{persistence}#.
-
-If the boot parameter #{persistence}# is set (and #{nopersistence}# is not
-set), local storage media (e.g. hard disks, USB drives) will be probed for
-persistence volumes during boot. It is possible to restrict which types of
-persistence volumes to use by specifying certain boot parameters described
-in the live-boot(7) man page. A persistence volume is any of the following:
-
-_* a partition, identified by its GPT name.
-
-_* a filesystem, identified by its filesystem label.
-
-_* an image file located on the root of any readable filesystem (even an
-NTFS partition of a foreign OS), identified by its file name. In this case
-the file name must also use the containing filesystem as the file extension,
-e.g. "persistence.ext4".
-
-The volume label for overlays must be #{persistence}#. And in order to fully
-customize the volume's persistence there must be a file named
-#{live-persistence.conf}#. See {The live-persistence.conf
-file}#live-persistence-conf
-
-Here are some examples of how to prepare a volume to be used for
-persistence. It can be, for instance, an ext4 partition on a hard disk or on
-a usb key created with, e.g.:
+2~persistence Persistència
+
+Un paradigma d'un live cd és ser un sistema pre-instaŀlat, que arrenca desde
+medis de només lectura, com un cdrom, on les modificacions no sobreviuen als
+reinicis del maquinari que l'executa.
+
+Un sistema Debian Live és una generalització d'aquest paradigma i per tant,
+compatible amb altres medis, a més dels CDs, però tot i així, en el seu
+comportament per defecte, s'ha de considerar de només lectura i totes les
+evolucions en temps d'execució del sistema es perden al apagar l'equip.
+
+La "Persistència" és un nom comú per nomenar els diferents tipus de
+solucions per guardar després de reiniciar algunes, o totes, les dades
+d'aquesta evolució en temps d'execució del sistema. Per entendre com
+funciona, seria útil saber que, encara que el sistema s'inicia i s'executa
+des de medis de només lectura, les modificacions als fitxers i directoris
+s'escriuen ens medis d'escriptura, en general un ramdisk (tmpfs) i les dades
+dels discos ram no sobreviuen als reinicis.
+
+Les dades emmagatzemades en aquest disc ram han de ser guardades en un
+suport d'escriptura persistent com medis d'emmagatzematge locals, un recurs
+compartit de xarxa o fins i tot una sessió d'una multisessió de un CD/DVD
+(re)grabable. Tots aquests medis són compatibles amb Debian Live de
+diferents maneres, i totes menys l'última d'elles requereixen un paràmetre
+d'arrencada especial que s'especifica en l'arrencada: #{persistence}#.
+
+Si s'utilitza el paràmetre d'arrencada #{persistence}# (i no s'utilitza
+#{nopersistence}#) es proven els medis locals d'emmagatzematge (per exemple,
+discs durs, unitats USB) buscant volums amb persistència durant
+l'arrencada. És possible restringir els tipus de volums amb persistència que
+s'utilitzarà mitjançant l'especificació de certs paràmetres d'arrencada que
+es descriuen a la pàgina del manual de live-boot(7). Un volum amb
+persistència és qualsevol dels següents:
+
+_* una partició, identificada pel seu nom GPT.
+
+_* un sistema de fitxers, identificat per la seva etiqueta de sistema de
+fitxers.
+
+_* un fitxer imatge situat en l'arrel de qualsevol sistema de fitxers
+llegibles (fins i tot una partició NTFS d'un altre SO), identificat pel seu
+nom de fitxer. En aquest cas el nom del fitxer ha d'utilitzar també el
+sistema de fitxers que conté com extensió del nom, per exemple,
+"persistence.ext4".
+
+L'etiqueta de volum per als overlays ha de ser #{persistence}#. I per tal de
+personalitzar completament la persistència del volum hi ha d'haver un arxiu
+anomenat #{live-persistence.conf}#. Veure {El fitxer
+live-persistence.conf}#live-persistence-conf
+
+Aquests són alguns exemples de com preparar un volum que s'utilitzarà per a
+la persistència. Pot ser, per exemple, una partició ext4 en un disc dur o en
+una clau USB creat amb, per exemple:
code{
@@ -192,10 +207,11 @@ code{
}code
-See also {Using the space left on a USB stick}#using-usb-extra-space.
+Veure també {Utilitzar l'espai que queda en una memòria
+USB}#using-usb-extra-space.
-If you already have a partition on your device, you could just change the
-label with one of the following:
+Si ja hi ha una partició al dispositiu, és pot canviar l'etiqueta amb un
+dels següents:
code{
@@ -203,8 +219,8 @@ code{
}code
-Here's an example of how to create an ext4-based image file used for
-persistence:
+Heus aquí un exemple de com crear un fitxer imatge basat en ext4 utilitzat
+per a la persistència:
code{
@@ -213,19 +229,21 @@ code{
}code
-Then copy the #{persistence}# file to the root of a writable partition.
+A continuació, copiar el fitxer #{persistence}# a l'arrel d'una partició
+d'escriptura.
-3~live-persistence-conf The live-persistence.conf file
+3~live-persistence-conf El fitxer live-persistence.conf
-A volume with the label #{persistence}# can be configured to make arbitrary
-directories persistent. The file #{live-persistence.conf}#, located on the
-volume's filesystem root, controls which directories it makes persistent,
-and in which way.
+Un volum amb l'etiqueta #{persistence}# pot ser configurat per fer
+directoris arbitraris persistents. El fitxer #{live-persistence.conf}#,
+ubicat a l'arrel del sistema de fitxers del volum, controla els directoris
+que fa persistents, i de quina manera.
-How custom overlay mounts are configured is described in full detail in the
-live-persistence.conf(5) man page, but a simple example should be sufficient
-for most uses. Let's say we want to make our home directory and APT cache
-persistent in an ext4 filesystem on the /dev/sdb1 partition:
+A la pàgina de manual de live-persistence.conf(5) s'explica en detall com es
+configuran els muntatges de les overlays, però un simple exemple hauria de
+ser suficient per la majoria d'usos. Si es vol fer el directori home i el
+directori del cache d'APT persistents en un sistema de fitxers ext4 a la
+partició /dev/sdb1:
code{
@@ -236,30 +254,33 @@ code{
}code
-Then we reboot. During the first boot the contents of #{/home}# and
-#{/var/cache/apt}# will be copied into the persistence volume, and from then
-on all changes to these directories will live in the persistence
-volume. Please note that any paths listed in the #{live-persistence.conf}#
-file cannot contain white spaces or the special #{.}# and #{..}# path
-components. Also, neither #{/live}# (or any of its sub-directories) nor
-#{/}# can be made persistent using custom mounts.
-
-Several different custom overlay volumes (with their own
-#{live-persistence.conf}# files) can be used at the same time, but if
-several volumes make the same directory persistent, only one of them will be
-used. If any two mounts are "nested" (i.e. one is a sub-directory of the
-other) the parent will be mounted before the child so no mount will be
-hidden by the other. Nested custom mounts are problematic if they are listed
-in the same #{live-persistence.conf}# file. See the live-persistence.conf(5)
-man page for how to handle that case if you really need it (hint: you
-usually don't).
-
-3~ Using more than one persistence store
-
-If a user would need multiple persistence store of the same type for
-different locations or testing, such as #{persistence-nonwork}# and
-#{persistence-work}#, the boot parameter #{persistence-label}# used in
-conjunction with the boot parameter #{persistence}# will allow for multiple
-but unique persistence media. An example would be if a user wanted to use a
-persistence partition labeled #{persistence-subText}# they would use the
-boot parameters of: #{persistence}# #{persistence-label=subText}#.
+Després es reinicia el sistema. Durant la primera arrencada el contingut de
+#{/home}# i #{/var/cache/apt}# es copiaran en el volum de la persistència, i
+d'aquí en endavant tots els canvis en aquests directoris es guardaran en el
+volum de la persistència. Tenir en compte que les rutes que apareixen en el
+fitxer #{live-persistence.conf}# no poden contenir espais en blanc o els
+components especials #{.}# i #{..}#. A més, ni #{/live}# (o qualsevol dels
+seus subdirectoris) ni #{/}# es poden fer persistents utilitzant muntatges
+personalitzats.
+
+Es poden utilitzar diversos volums diferents de muntatges personalitzats
+(amb els seus propis fitxers #{live-persistence.conf}# però si diversos
+volums fan que el mateix directori sigui persistent, només s'utilitzarà un
+d'ells. Si qualsevol dels dos muntatges són "imbricats" (és a dir, un és un
+sub-directori de l'altre) el directori pare es muntarà abans que el
+directori fill per evitar que amb el muntatge un directori no sigui ocultat
+per l'altre. Els muntatges personalitzats imbricats són problemàtics si
+estan enumerats en el mateix fitxer #{live-persistence.conf}#. Veure la
+pàgina de manual live-persistence.conf(5) per saber com manejar aquest cas,
+si realment es necessita (una pista: en general no cal fer-ho).
+
+3~ Utilitzar més d'un magatzem de persistència
+
+Si un usuari necessita múltiples magatzems de persistència del mateix tipus
+per a diferents ubicacions o proves, com #{persistence-nonwork}# i
+#{persistence-work}#, el paràmetre d'arrencada #{persistence-label}#
+utilitzat juntament amb el paràmetre d'arrencada #{persistence}# permetrà
+tenir diversos medis amb la mateixa persistència. Un exemple seria si un
+usuari vol escollir una partició amb persistència amb l'etiqueta
+#{persistence-subText}# utilitzaria els paràmetres d'arrencada:
+#{persistence}# #{persistence-label=subText}#.
diff --git a/manual/ca/user_examples.ssi b/manual/ca/user_examples.ssi
index 25a1fb7..20e27ce 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,52 @@ 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 initial
+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}#:
+As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you
+may need to re-add some recommended packages to make your image work
+properly.
+
+An easy way to list recommends is using /{apt-cache}/. For example:
+
+code{
+
+ $ apt-cache depends live-config live-boot
+
+}code
+
+In this example we found out that we had to re-include several packages
+recommended by live-config and live-boot: #{user-setup}# to make autologin
+work and #{sudo}# as an essential program to shutdown the system. Besides,
+it could be handy to add #{live-tools}# to be able to copy the image to RAM
+and #{eject}# to eventually eject the live media, So:
+
+code{
+
+$ echo "live-tools user-setup sudo eject" >
+config/package-lists/recommends.list.chroot
+
+}code
+
+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 +314,31 @@ 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 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
+
+}code
+
+To make the image work properly, we must re-add, at least, two recommended
+packages which are left out by the #{--apt-recommends false}# option. See
+{Tweaking APT to save space}#tweaking-apt-to-save-space
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ echo "user-setup sudo" > config/package-lists/recommends.list.chroot
}code
@@ -314,23 +350,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.chroot}# 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
@@ -373,10 +413,11 @@ code{
}code
At boot time we will generate the pt_BR.UTF-8 locale and select the
-pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
-"kde" so that tasksel will install the correct desktop task, as it differs
-from the default (see {Desktop and languages
-tasks}#desktop-and-language-tasks). Now let's put the pieces together:
+pt-latin1 keyboard layout. Now let's put the pieces together. Recalling from
+{Using metapackages}#using-metapackages that task metapackages are prefixed
+#{task-}#, we just specify these language boot parameters, then add standard
+priority packages and all our discovered task metapackages to our package
+list as follows:
code{
@@ -387,10 +428,10 @@ code{
-k 486 \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
- brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
- $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
- $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \
+ task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot
}code
diff --git a/manual/ca/user_installation.ssi b/manual/ca/user_installation.ssi
index ea9c8a5..887e107 100644
--- a/manual/ca/user_installation.ssi
+++ b/manual/ca/user_installation.ssi
@@ -10,11 +10,11 @@ _* Accés de superusuari (root)
_* Una versió actualitzada de live-build
-_* Una shell compatible amb POSIX, com ara /{bash}/ o /{dash}/.
+_* Una shell compatible amb POSIX, com ara /{bash}/ o /{dash}/
_* /{debootstrap}/ o /{cdebootstrap}/
-_* Linux 2.6.x
+_* Linux 2.6.x o 3.x
Tenir en compte que no cal usar Debian o una distribució derivada de Debian
ja que live-build funcionarà en gairebé qualsevol distribució amb els
@@ -157,15 +157,30 @@ code{
}code
-_* Utilitzar tots el fitxers .deb generats
+_* Utilitzar tots el fitxers .deb generats que calguin
+
+Com live-boot y live-config són instaŀlats per el sistema de construcció
+live-build, la instaŀlació dels paquets en el sistema amfitrió no és
+suficient: s'ha de tractar els .deb generats com si fossin uns paquets
+personalitzats. Ja que el propòsit per construir aquests paquets a partir
+del codi font és per provar coses noves a curt termini abans del llançament
+oficial, seguir els pasos de {Instaŀlació de paquets modificats o de
+tercers}#installing-modified-or-third-party-packages per incloure
+temporalment els paquets rellevants en la configuració. En particular, cal
+observar que ambdós paquets es divideixen en una part genèrica, una part de
+documentació i un o més back-ends. Incloure la part genèrica, només un dels
+back-end que coincideixi amb la configuració, i, opcionalment, la
+documentació. Suposant que s'està construint una imatge en viu en el
+directori actual i que s'han generat tots els .deb per a una única versió
+dels dos paquets al directori superior, aquestes ordres de bash són per
+copiar tots els paquets importants, incloent-hi els back-ends per defecte:
-Com live-boot i live-config són instaŀlats pel sistema live-build, instaŀlar
-els paquets en el sistema amfitrió no és suficient: S'han de tractar tots
-els fitxers .deb generats igual que qualsevol altre paquet personalitzat. Si
-us plau veure {Personalització de l'instaŀlació de
-paquets}#customizing-package-installation per a més informació. S'ha de
-prestar especial atenció a {Repositoris
-addicionals}#additional-repositories.
+code{
+
+ $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/
+ $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/
+
+}code
3~ A partir d'instantànies
diff --git a/manual/ca/user_managing_a_configuration.ssi b/manual/ca/user_managing_a_configuration.ssi
index 79d297e..b5ba697 100644
--- a/manual/ca/user_managing_a_configuration.ssi
+++ b/manual/ca/user_managing_a_configuration.ssi
@@ -6,92 +6,127 @@ En aquest capítol s'explica com gestionar una configuració en viu des de la
seva creació inicial, a través de revisions i versions successives de tant
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}#
+2~ Gestionar canvis a la configuració
+
+Les configuracions en viu poques vegades són perfectes al primer
+intent. Passar opcions de #{lb config}# des de la línea d'ordres pot estar
+be per construir una imatge una vegada, però és més típic revisar aquestes
+opcions i construir de nou fins que se'n estigui satisfet. Per donar suport
+a aquests canvis, es poden utilitzar scripts auto que assegurin que la seva
+configuració es manté en un estat coherent.
+
+3~ Per què utilitzar scripts auto? Què fan?
+
+L'ordre #{lb config}# emmagatzema les opcions que se li passen en els
+fitxers de #{config/*}#, juntament amb moltes altres opcions que estan
+establertes als valors per defecte. Si s'executa un cop més, #{lb config}#
+no restablirà cap de les opcios dependents basades en les opcions
+inicials. Així, per exemple, si s'executa #{lb config}# de nou amb un nou
+valor per #{--distribution}#, totes les opcions que en depenen que es van
+omplir per a la distribució per defecte ja no poden funcionar amb la
+nova. Tampoc són aquests fitxers destinats a ser llegits o
+editats. S'emmagatzemen els valors per més de cent opcions, i ningú serà
+capaç de veure aquestes opcions que s'han especificat realment. I,
+finalment, si s'executa #{lb config}# i a continuació s'actualitza
+live-build i canvia el nom d'una opció, #{config/*}# encara conté les
+variables de l'opció vella que ja no són vàlides.
+
+ 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
+
+Per a més comoditat, live-build ve amb uns scripts d'exemple per copiar i
+editar. Iniciar una nova configuració per defecte, i a continuació, copiar
+els exemples:
+
+code{
+
+ $ mkdir mylive && cd mylive && lb config
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
+
+}code
+
+Editar #{auto/config}#, afegint les opcions com millor li sembli. Per
+exemple:
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}#
+Ara, cada vegada que s'utilitzi #{lb config}#, #{auto/config}# restablirà la
+configuració basada en aquestes opcions. Quan es vulguin fer canvis, editar
+les opcions d'aquest fitxer en lloc de passar-les a #{lb config}#. Quan
+s'utilitza #{lb clean}#, #{auto/clean}# netejarà els fitxers de #{config/*}#
+juntament amb els altres productes de construcció. I, finalment, quan
+s'utilitza #{lb build}#, es crea un log de la construcció mitjançant
+#{auto/build}# anomenat #{build.log}#.
+
+Nota: Aquí s'utilitza un paràmetre especial #{noauto}# per suprimir un altra
+crida a #{auto/config}#, la qual cosa impedeix la recursivitat
+infinita. Assegurar-se de no eliminarlo accidentalment fent canvis. També,
+tenir cura de que quan es divideix l'ordre #{lb config}# a través de
+diverses línies per facilitar la lectura, com es mostra en l'exemple
+anterior, no s'oblidi la barra invertida (\) al final de cada línia que
+segueix a la següent.
+
+2~ Clonar una configuració publicada via Git
+
+Utilitzar l'opció #{lb config --config}# 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 --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 --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 5f278d1..957c529 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,13 +9,13 @@
: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: 27.07.2012
+ :published: 2012-08-10
@publisher: Debian Live Projekt <debian-live at lists.debian.org>
@make:
- :bold: /squeeze|wheezy|sid/
- :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|jessie|sid/
+ :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
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/style_guide.ssi b/manual/de/style_guide.ssi
index f3fafb2..415842b 100644
--- a/manual/de/style_guide.ssi
+++ b/manual/de/style_guide.ssi
@@ -327,20 +327,12 @@ that they use exactly the same markup as the original English version.
_* /{Code blocks}/
-Some translators decide to include the code blocks in the translated files
-because it is easier for them to identify what has already been translated
-and what has not by looking at the percentages if they use a graphical
-translation program.
-
-Include the code blocks if you want to score a 100% complete translation.
-
-On the other hand some translators prefer to leave the code blocks
-"untranslated" (i.e. not including them). This makes the translation easier
-to maintain once finished because it does not require translators
-intervention if the code changes.
-
-Leave the code blocks empty (they will be automatically added then) if you
-want to make your translation easier to maintain.
+Even though the code blocks are usually untranslatable, including them in
+the translation is the only way to score a 100% complete translation. And
+even though it means more work at first because it requires the intervention
+of the translators if the code changes, it is the best way, in the long run,
+to identify what has already been translated and what has not when checking
+the integrity of the .po files.
_* /{Newlines}/
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 eb3724f..53f2c76 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -10,9 +10,9 @@ are available to install in the image are the distribution and archive
areas. To ensure decent download speeds, you should choose a nearby
distribution mirror. You can also add your own repositories for backports,
experimental or custom packages, or include packages directly as files. You
-can define your own lists of packages to include, use live-build's
-predefined lists, use /{tasksel}/ tasks, or a combination of all
-three. Finally, a number of options give some control over /{apt}/, or if
+can define lists of packages, including metapackages which will install many
+related packages at once, such as packages for a particular desktop or
+language. Finally, a number of options give some control over /{apt}/, or if
you prefer, /{aptitude}/, at build time when packages are installed. You may
find these handy if you use a proxy, want to disable installation of
recommended packages to save space, or need to control which versions of
@@ -148,44 +148,76 @@ code{
There are a number of ways to choose which packages live-build will install
in your image, covering a variety of different needs. You can simply name
-individual packages to install in a package list. You can also choose
-predefined lists of packages, or use APT tasks. And finally, you may place
-package files in your #{config/}# tree, which is well suited to testing of
-new or experimental packages before they are available from a repository.
+individual packages to install in a package list. You can also use
+metapackages in those lists, or select them using package control file
+fields. And finally, you may place package files in your #{config/}# tree,
+which is well suited to testing of new or experimental packages before they
+are available from a repository.
3~package-lists Package lists
Package lists are a powerful way of expressing which packages should be
installed. The list syntax supports included files and conditional sections
which makes it easy to build lists from other lists and adapt them for use
-in multiple configurations. You can use predefined package lists, providing
-in a modular fashion package selections from each of the major desktop
-environments and some special purpose lists, as well as standard lists the
-others are based upon. You can also provide your own package lists, or use a
-combination of both.
+in multiple configurations. Package names may also be injected into the list
+using shell helpers at build time.
*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.
-3~ Predefined package lists
+3~using-metapackages Using metapackages
-The simplest way to use lists is to specify one or more predefined lists
-with the #{--package-lists}# option. For example:
+The simplest way to populate your package list is to use a task metapackage
+maintained by your distribution. For example:
code{
- $ lb config --package-lists "gnome rescue"
+ $ lb config
+ $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot
+
+}code
+
+This supercedes the older predefined list method supported in #{live-build}#
+2.x. Unlike predefined lists, task metapackages are not specific to the
+Debian Live project. Instead, they are maintained by specialist working
+groups within the distribution and therefore reflect the consensus of each
+group about which packages best serve the needs of the intended users. They
+also cover a much broader range of use cases than the predefined lists they
+replace.
+
+All task metapackages are prefixed #{task-}#, so a quick way to determine
+which are available (though it may contain a handful of false hits that
+match the name but aren't metapackages) is to match on the package name
+with:
+
+code{
+
+ $ apt-cache search --names-only ^task-
}code
-The default location for the list files on your system is
-#{/usr/share/live/build/package-lists/}#. To determine the packages in a
-given list, read the corresponding file, paying attention to included files
-and conditionals as described in the following sections.
+In addition to these, you will find other metapackages with various
+purposes. Some are subsets of broader task packages, like #{gnome-core}#,
+while others are individual specialized parts of a Debian Pure Blend, such
+as the #{education-*}# metapackages. To list all metapackages in the
+archive, install the #{debtags}# package and list all packages with the
+#{role::metapackage}# tag as follows:
+
+code{
+
+ $ debtags search role::metapackage
+
+}code
3~ Local package lists
-You may supplement the predefined lists using local package lists stored in
-#{config/package-lists/}#.
+Whether you list metapackages, individual packages, or a combination of
+both, all local package lists are stored in #{config/package-lists/}#. Since
+more than one list can be used, this lends itself well to modular
+designs. For example, you may decide to devote one list to a particular
+choice of desktop, another to a collection of related packages that might as
+easily be used on top of a different desktop. This allows you to experiment
+with different combinations of sets of packages with a minimum of fuss,
+sharing common lists between different live image projects.
Package lists that exist in this directory need to have a #{.list}# suffix
in order to be processed, and then an additional stage suffix, #{.chroot}#
@@ -202,20 +234,25 @@ 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~ Extending a provided package list using includes
+3~generated-package-lists Generated package lists
-The package lists that are included with live-build make extensive use of
-includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
-directory, as they serve as good examples of how to write your own 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
+command to be executed within the chroot when the image is built. For
+example, one might include the line #{! grep-aptavail -n -sPackage
+-FPriority standard | sort}# in a package list to produce a sorted list of
+available packages with #{Priority: standard}#.
-For example, to make a list that includes the predefined #{gnome}# list plus
-/{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the
+In fact, selecting packages with the #{grep-aptavail}# command (from the
+#{dctrl-tools}# package) is so useful that #{live-build}# provides a
+#{Packages}# helper script as a convenience. This script takes two
+arguments: #{field}# and #{pattern}#. Thus, you can create a list with the
following contents:
code{
- #include <gnome>
- iceweasel
+ $ lb config
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
}code
@@ -275,28 +312,6 @@ code{
The nesting of conditionals is not supported.
-3~ Tasks
-
-The Debian Installer offers the user choices of a number of preselected
-lists of packages, each one focused on a particular kind of system, or task
-a system may be used for, such as "Graphical desktop environment", "Mail
-server" or "Laptop". These lists are called "tasks" and are supported by APT
-through the "Task:" field. You can specify one or more tasks in live-build
-by putting them in a list in #{config/task-lists/}#, as in the example
-below.
-
-code{
-
- $ lb config
- $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
-
-}code
-
-The primary tasks available in the Debian Installer can be listed with
-#{tasksel --list-tasks}# in the live system. The contents of any task,
-including the ones not included in this list, may be examined with #{tasksel
---task-packages}#.
-
3~desktop-and-language-tasks Desktop and language tasks
Desktop and language tasks are special cases that need some extra planning
@@ -320,30 +335,16 @@ Because there is no provision made automatically for language tasks, which
include such things as language-specific fonts and input-method packages, if
you want them, you need to specify them in your configuration. For example,
a GNOME desktop image containing support for Japanese might include these
-tasks:
+task metapackages:
code{
$ lb config
- $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
- $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
+ $ echo "task-gnome-desktop task-laptop" >> config/package-lists/my.list.chroot
+ $ echo "task-japanese task-japanese-desktop task-japanese-gnome-desktop" >> config/package-lists/my.list.chroot
}code
-Since desktop tasks are "internal" tasks, for every desktop flavour task
-included in the image, the corresponding value, if it differs from the
-default, "gnome", must be preseeded in the "tasksel/desktop" debconf
-variable or else tasksel will not recognize and install it. Thus:
-
-code{
-
- $ lb config
- $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
-
-}code
-
-This parameter can take multiple values, e.g. "lxde xfce" instead of "kde".
-
2~installing-modified-or-third-party-packages Installing modified or
third-party packages
@@ -451,7 +452,7 @@ code{
}code
-3~ Tweaking APT to save space
+3~tweaking-apt-to-save-space Tweaking APT to save space
You may find yourself needing to save some space on the image media, in
which case one or the other or both of the following options may be of
@@ -473,7 +474,8 @@ before performing #{apt-cache search}# or #{apt-get install}#, for instance,
the user must #{apt-get update}# first to create those indices.
If you find the installation of recommended packages bloats your image too
-much, you may disable that default option of APT with:
+much, provided you are prepared to deal with the consequences discussed
+below, you may disable that default option of APT with:
code{
@@ -481,17 +483,27 @@ code{
}code
-The tradeoff here is that if you don't install recommended packages for a
-given package, that is, "packages that would be found together with this one
-in all but unusual installations" (Debian Policy Manual, section 7.2), some
-packages that you actually need may be omitted. Therefore, we suggest you
-review the difference turning off recommends makes to your packages list
-(see the #{binary.packages}# file generated by #{lb build}#) and re-include
-in your list any missing packages that you still want
-installed. Alternatively, if you find you only want a small number of
-recommended packages left out, leave recommends enabled and set a negative
-APT pin priority on selected packages to prevent them from being installed,
-as explained in {APT pinning}#apt-pinning.
+The most important consequence of turning off recommends is that
+#{live-boot}# and #{live-config}# themselves recommend some packages that
+provide important functionality used by most Live configurations, such as
+#{user-setup}# which #{live-config}# recommends and is used to create the
+live user. In all but the most exceptional circumstances you need to add
+back at least some of these recommends to your package lists or else your
+image will not work as expected, if at all. Look at the recommended packages
+for each of the #{live-*}# packages included in your build and if you are
+not certain you can omit them, add them back into your package lists.
+
+The more general consequence is that if you don't install recommended
+packages for any given package, that is, "packages that would be found
+together with this one in all but unusual installations" (Debian Policy
+Manual, section 7.2), some packages that users of your Live system actually
+need may be omitted. Therefore, we suggest you review the difference turning
+off recommends makes to your packages list (see the #{binary.packages}# file
+generated by #{lb build}#) and re-include in your list any missing packages
+that you still want installed. Alternatively, if you find you only want a
+small number of recommended packages left out, leave recommends enabled and
+set a negative APT pin priority on selected packages to prevent them from
+being installed, as explained in {APT pinning}#apt-pinning.
3~ Passing options to apt or aptitude
@@ -539,10 +551,11 @@ $ lb config --distribution wheezy
Negative pin priorities will prevent a package from being installed, as in
the case where you do not want a package that is recommended by another
-package. Suppose you are building an LXDE image using #{--package-lists
-lxde}# option, but don't want the user prompted to store wifi passwords in
-the keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in
-turn recommends /{gnome-keyring}/. So you want to omit the recommended
+package. Suppose you are building an LXDE image using #{task-lxde-desktop}#
+in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the
+user prompted to store wifi passwords in the keyring. This metapackage
+depends on /{lxde-core}/, which recommends /{gksu}/, which in turn
+recommends /{gnome-keyring}/. So you want to omit the recommended
/{gnome-keyring}/ package. This can be done by adding the following stanza
to #{config/chroot_apt/preferences}#:
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index 47d89df..4bae885 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -76,7 +76,7 @@ encoding for each can be found in #{/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-variant}#, #{keyboard-options}# and
+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
@@ -117,7 +117,7 @@ layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
}code
@@ -125,8 +125,8 @@ 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
+#{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:
@@ -134,7 +134,7 @@ Dvorak, use:
code{
$ lb config --bootappend-live \
- "keyboard-layouts=us,us keyboard-variant=,dvorak"
+ "keyboard-layouts=us,us keyboard-variants=,dvorak"
}code
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 933cb24..6342ce0 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,52 @@ 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 initial
+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}#:
+As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you
+may need to re-add some recommended packages to make your image work
+properly.
+
+An easy way to list recommends is using /{apt-cache}/. For example:
+
+code{
+
+ $ apt-cache depends live-config live-boot
+
+}code
+
+In this example we found out that we had to re-include several packages
+recommended by live-config and live-boot: #{user-setup}# to make autologin
+work and #{sudo}# as an essential program to shutdown the system. Besides,
+it could be handy to add #{live-tools}# to be able to copy the image to RAM
+and #{eject}# to eventually eject the live media, So:
+
+code{
+
+$ echo "live-tools user-setup sudo eject" >
+config/package-lists/recommends.list.chroot
+
+}code
+
+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 +314,31 @@ 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 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
+
+}code
+
+To make the image work properly, we must re-add, at least, two recommended
+packages which are left out by the #{--apt-recommends false}# option. See
+{Tweaking APT to save space}#tweaking-apt-to-save-space
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ echo "user-setup sudo" > config/package-lists/recommends.list.chroot
}code
@@ -314,23 +350,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.chroot}# 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
@@ -373,10 +413,11 @@ code{
}code
At boot time we will generate the pt_BR.UTF-8 locale and select the
-pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
-"kde" so that tasksel will install the correct desktop task, as it differs
-from the default (see {Desktop and languages
-tasks}#desktop-and-language-tasks). Now let's put the pieces together:
+pt-latin1 keyboard layout. Now let's put the pieces together. Recalling from
+{Using metapackages}#using-metapackages that task metapackages are prefixed
+#{task-}#, we just specify these language boot parameters, then add standard
+priority packages and all our discovered task metapackages to our package
+list as follows:
code{
@@ -387,10 +428,10 @@ code{
-k 486 \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
- brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
- $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
- $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \
+ task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot
}code
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index 2a28091..e0267f4 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -10,11 +10,11 @@ _* Super user (root) access
_* An up-to-date version of live-build
-_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/.
+_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/
_* /{debootstrap}/ or /{cdebootstrap}/
-_* Linux 2.6.x
+_* Linux 2.6.x or 3.x
Note that using Debian or a Debian-derived distribution is not required -
live-build will run on almost any distribution with the above requirements.
@@ -151,14 +151,28 @@ code{
}code
-_* Use all generated .deb files
+_* Use applicable generated .deb files
As live-boot and live-config are installed by live-build system, installing
the packages in the host system is not sufficient: you should treat the
-generated .deb files like any other custom packages. Please see {Customizing
-package installation}#customizing-package-installation for more
-information. You should pay particular attention to {Additional
-repositories}#additional-repositories.
+generated .deb files like any other custom packages. Since your purpose for
+building from source is like to test new things over the short term before
+the official release, follow {Installing modified or third-party
+packages}#installing-modified-or-third-party-packages to temporarily include
+the relevant files in your configuration. In particular, notice that both
+packages are divided into a generic part, a documentation part and one or
+more back-ends. Include the generic part, only one back-end matching your
+configuration, and optionally the documentation. Assuming you are building a
+live image in the current directory and have generated all .deb files for a
+single version of both packages in the directory above, these bash commands
+would copy all of the relevant packages including default back-ends:
+
+code{
+
+ $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/
+ $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/
+
+}code
3~ From 'snapshots'
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index a79f060..3283a0f 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -6,89 +6,121 @@ This chapter explains how to manage a live configuration from initial
creation, through successive revisions and successive releases of both the
live-build software and the live image itself.
-2~ Use auto to manage configuration changes
-
-Live configurations rarely are perfect on the first try. You'll likely need
-to make a series of revisions until you are satisfied. However,
-inconsistencies can creep into your configuration from one revision to the
-next if you aren't careful. The main problem is, once a variable is given a
-default value, that value will not be recomputed from other variables that
-may change in later revisions.
-
-For example, when the distribution is first set, many 'dependent' variables
-are given default values that suit that distribution. However, if you later
-decide to change the distribution, those dependent variables continue to
-retain old values that are no longer appropriate.
-
-A second, related problem is that if you run #{lb config}# and then upgrade
-to a new version of live-build that has changed one of the variable names,
-you will discover this only by manual review of the variables in your
-#{config/*}# files, which you will then need to use to set the appropriate
-option again.
-
-All of this would be a terrible nuisance if it weren't for auto/* scripts,
-simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
-that are designed to help you manage your configuration. Simply create an
-auto/config script containing #{lb config}# command with all desired
-options, and an auto/clean that removes the files containing configuration
-variable values, and each time you 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}#
+2~ Dealing with configuration changes
+
+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 use auto scripts? What do they do?
+
+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 --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 --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 db303d9..0456a5e 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,13 +9,13 @@
: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-07-27
+ :published: 2012-08-10
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /squeeze|wheezy|sid/
- :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|jessie|sid/
+ :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/en/project_bugs.ssi b/manual/en/project_bugs.ssi
index 8780c90..29f9d84 100644
--- a/manual/en/project_bugs.ssi
+++ b/manual/en/project_bugs.ssi
@@ -2,7 +2,7 @@ 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 better to fill a report twice than never. However, this chapter includes recommendations how to file good bug reports.
+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.
For the impatient:
@@ -14,11 +14,11 @@ _* Try to give *{as specific information as possible}* about the bug. This inclu
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.
+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.
Currently known issues are listed under the section 'status' on our homepage at http://live.debian.net/.
@@ -34,7 +34,7 @@ Using outdated packages can cause significant problems when trying to reproduce
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 information if you think that it might help in solving the problem.
+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 information:
@@ -56,7 +56,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 {Managing a configuration}#managing-a-configuration for details).
+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{
@@ -72,19 +72,19 @@ Remember to send in any logs that were produced with English locale settings, e.
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 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.
+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~ 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 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.
-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
-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.
+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 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.
+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~ At build time whilst installing packages
@@ -92,23 +92,23 @@ live-build installs additional packages from the Debian archive and depending on
If this is the case, this is not a bug in Debian Live, but rather in Debian - please report it against the failing package. Running /{debootstrap}/ 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.
+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~ 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,
+If a package was successfully installed, but fails while actually running 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 workaround has been proposed.
+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.
You should pay particular attention to the Debian Live mailing list, as well as the homepage, as these are likely to contain the most up-to-date information. If such information exists, always include the references to it in your bug report.
-In addition, you should check the current bug lists for live-build, live-boot, live-config and live-tools to see whether something similar has been reported already.
+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~ Where to report bugs
diff --git a/manual/en/style_guide.ssi b/manual/en/style_guide.ssi
index b7b4092..7ba27de 100644
--- a/manual/en/style_guide.ssi
+++ b/manual/en/style_guide.ssi
@@ -216,13 +216,7 @@ Translators working initially with *{pot}* files and later on with *{po}* files
_* /{Code blocks}/
-Some translators decide to include the code blocks in the translated files because it is easier for them to identify what has already been translated and what has not by looking at the percentages if they use a graphical translation program.
-
-Include the code blocks if you want to score a 100% complete translation.
-
-On the other hand some translators prefer to leave the code blocks "untranslated" (i.e. not including them). This makes the translation easier to maintain once finished because it does not require translators intervention if the code changes.
-
-Leave the code blocks empty (they will be automatically added then) if you want to make your translation easier to maintain.
+Even though the code blocks are usually untranslatable, including them in the translation is the only way to score a 100% complete translation. And even though it means more work at first because it requires the intervention of the translators if the code changes, it is the best way, in the long run, to identify what has already been translated and what has not when checking the integrity of the .po files.
_* /{Newlines}/
diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index 0b4546c..76ae268 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -6,14 +6,12 @@ This chapter discusses fine-tuning customization of the live system contents bey
2~includes Includes
-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:
+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: These allow you to add or replace files to the chroot/Live filesystem. Please see {Live/chroot local includes}#live-chroot-local-includes for more information.
_* 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.
3~live-chroot-local-includes Live/chroot local includes
@@ -58,18 +56,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 build in order to customize the image.
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 5f30eea..5e1a7c9 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -2,7 +2,7 @@
1~customizing-package-installation Customizing package installation
-Perhaps the most basic customization of a Debian live system is the selection of packages to be included in the image. This chapter guides you through the various build-time options to customize live-build's installation of packages. The broadest choices influencing which packages are available to install in the image are the distribution and archive areas. To ensure decent download speeds, you should choose a nearby distribution mirror. You can also add your own repositories for backports, experimental or custom packages, or include packages directly as files. You can define your own lists of packages to include, use live-build's predefined lists, use /{tasksel}/ tasks, or a combination of all three. Finally, a number of options give some control over /{apt}/, or if you prefer, /{aptitude}/, at build time when packages are installed. You may find these handy if you use a proxy, want to disable installation of recommended packages to save space, or need to control which vers
ions of packages are installed via APT pinning, to name a few possibilities.
+Perhaps the most basic customization of a Debian live system is the selection of packages to be included in the image. This chapter guides you through the various build-time options to customize live-build's installation of packages. The broadest choices influencing which packages are available to install in the image are the distribution and archive areas. To ensure decent download speeds, you should choose a nearby distribution mirror. You can also add your own repositories for backports, experimental or custom packages, or include packages directly as files. You can define lists of packages, including metapackages which will install many related packages at once, such as packages for a particular desktop or language. Finally, a number of options give some control over /{apt}/, or if you prefer, /{aptitude}/, at build time when packages are installed. You may find these handy if you use a proxy, want to disable installation of recommended packages to save space, or need to
control which versions of packages are installed via APT pinning, to name a few possibilities.
2~ Package sources
@@ -85,29 +85,46 @@ code{
2~choosing-packages-to-install Choosing packages to install
-There are a number of ways to choose which packages live-build will install in your image, covering a variety of different needs. You can simply name individual packages to install in a package list. You can also choose predefined lists of packages, or use APT tasks. And finally, you may place package files in your #{config/}# tree, which is well suited to testing of new or experimental packages before they are available from a repository.
+There are a number of ways to choose which packages live-build will install in your image, covering a variety of different needs. You can simply name individual packages to install in a package list. You can also use metapackages in those lists, or select them using package control file fields. And finally, you may place package files in your #{config/}# tree, which is well suited to testing of new or experimental packages before they are available from a repository.
3~package-lists Package lists
-Package lists are a powerful way of expressing which packages should be installed. The list syntax supports included files and conditional sections which makes it easy to build lists from other lists and adapt them for use in multiple configurations. You can use predefined package lists, providing in a modular fashion package selections from each of the major desktop environments and some special purpose lists, as well as standard lists the others are based upon. You can also provide your own package lists, or use a combination of both.
+Package lists are a powerful way of expressing which packages should be installed. The list syntax supports included files and conditional sections which makes it easy to build lists from other lists and adapt them for use in multiple configurations. Package names may also be injected into the list using shell helpers at build time.
*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.
-3~ Predefined package lists
+3~using-metapackages Using metapackages
-The simplest way to use lists is to specify one or more predefined lists with the #{--package-lists}# option. For example:
+The simplest way to populate your package list is to use a task metapackage maintained by your distribution. For example:
code{
- $ lb config --package-lists "gnome rescue"
+ $ lb config
+ $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot
+
+}code
+
+This supercedes the older predefined list method supported in #{live-build}# 2.x. Unlike predefined lists, task metapackages are not specific to the Debian Live project. Instead, they are maintained by specialist working groups within the distribution and therefore reflect the consensus of each group about which packages best serve the needs of the intended users. They also cover a much broader range of use cases than the predefined lists they replace.
+
+All task metapackages are prefixed #{task-}#, so a quick way to determine which are available (though it may contain a handful of false hits that match the name but aren't metapackages) is to match on the package name with:
+
+code{
+
+ $ apt-cache search --names-only ^task-
}code
-The default location for the list files on your system is #{/usr/share/live/build/package-lists/}#. To determine the packages in a given list, read the corresponding file, paying attention to included files and conditionals as described in the following sections.
+In addition to these, you will find other metapackages with various purposes. Some are subsets of broader task packages, like #{gnome-core}#, while others are individual specialized parts of a Debian Pure Blend, such as the #{education-*}# metapackages. To list all metapackages in the archive, install the #{debtags}# package and list all packages with the #{role::metapackage}# tag as follows:
+
+code{
+
+ $ debtags search role::metapackage
+
+}code
3~ Local package lists
-You may supplement the predefined lists using local package lists stored in #{config/package-lists/}#.
+Whether you list metapackages, individual packages, or a combination of both, all local package lists are stored in #{config/package-lists/}#. Since more than one list can be used, this lends itself well to modular designs. For example, you may decide to devote one list to a particular choice of desktop, another to a collection of related packages that might as easily be used on top of a different desktop. This allows you to experiment with different combinations of sets of packages with a minimum of fuss, sharing common lists between different live image projects.
Package lists that exist in this directory need to have a #{.list}# suffix in order to be processed, and then an additional stage suffix, #{.chroot}# or #{.binary}# to indicate which stage the list is for.
@@ -117,16 +134,16 @@ Package lists that exist in this directory need to have a #{.list}# suffix in or
To make a binary stage list, place a file suffixed with #{.list.binary}# in #{config/package-lists/}#. These packages are not installed in the live filesystem, but are included on the live media under #{pool/}#. You would 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~ Extending a provided package list using includes
+3~generated-package-lists Generated package lists
-The package lists that are included with live-build make extensive use of includes. Refer to these in the #{/usr/share/live/build/package-lists/}# directory, as they serve as good examples of how to write your own 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 command to be executed within the chroot when the image is built. For example, one might include the line #{! grep-aptavail -n -sPackage -FPriority standard | sort}# in a package list to produce a sorted list of available packages with #{Priority: standard}#.
-For example, to make a list that includes the predefined #{gnome}# list plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the following contents:
+In fact, selecting packages with the #{grep-aptavail}# command (from the #{dctrl-tools}# package) is so useful that #{live-build}# provides a #{Packages}# helper script as a convenience. This script takes two arguments: #{field}# and #{pattern}#. Thus, you can create a list with the following contents:
code{
- #include <gnome>
- iceweasel
+ $ lb config
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
}code
@@ -176,46 +193,22 @@ code{
The nesting of conditionals is not supported.
-3~ Tasks
-
-The Debian Installer offers the user choices of a number of preselected lists of packages, each one focused on a particular kind of system, or task a system may be used for, such as "Graphical desktop environment", "Mail server" or "Laptop". These lists are called "tasks" and are supported by APT through the "Task:" field. You can specify one or more tasks in live-build by putting them in a list in #{config/task-lists/}#, as in the example below.
-
-code{
-
- $ lb config
- $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
-
-}code
-
-The primary tasks available in the Debian Installer can be listed with #{tasksel --list-tasks}# in the live system. The contents of any task, including the ones not included in this list, may be examined with #{tasksel --task-packages}#.
-
3~desktop-and-language-tasks Desktop and language tasks
Desktop and language tasks are special cases that need some extra planning and configuration. Live images are different from Debian Installer images in this respect. In the Debian Installer, if the medium was prepared for a particular desktop environment flavour, the corresponding task will be automatically installed. Thus, there are internal #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there are no menu entries for tasks for languages, but the user's language choice during the install influences the selection of corresponding language tasks.
When developing a desktop live image, the image typically boots directly to a working desktop, the choices of both desktop and default language having been made at build time, not at run time as in the case of the Debian Installer. That's not to say that a live image couldn't be built to support multiple desktops or multiple languages and offer the user a choice, but that is not live-build's default behaviour.
-Because there is no provision made automatically for language tasks, which include such things as language-specific fonts and input-method packages, if you want them, you need to specify them in your configuration. For example, a GNOME desktop image containing support for Japanese might include these tasks:
-
-code{
-
- $ lb config
- $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
- $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
-
-}code
-
-Since desktop tasks are "internal" tasks, for every desktop flavour task included in the image, the corresponding value, if it differs from the default, "gnome", must be preseeded in the "tasksel/desktop" debconf variable or else tasksel will not recognize and install it. Thus:
+Because there is no provision made automatically for language tasks, which include such things as language-specific fonts and input-method packages, if you want them, you need to specify them in your configuration. For example, a GNOME desktop image containing support for Japanese might include these task metapackages:
code{
$ lb config
- $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
+ $ echo "task-gnome-desktop task-laptop" >> config/package-lists/my.list.chroot
+ $ echo "task-japanese task-japanese-desktop task-japanese-gnome-desktop" >> config/package-lists/my.list.chroot
}code
-This parameter can take multiple values, e.g. "lxde xfce" instead of "kde".
-
2~installing-modified-or-third-party-packages Installing modified or third-party packages
Whilst it is against the philosophy of Debian Live, it may sometimes be necessary to build a Live system with modified versions of packages that are in the Debian repository. This may be to modify or support additional features, languages and branding, or even to remove elements of existing packages that are undesirable. Similarly, "third-party" packages may be used to add bespoke and/or proprietary functionality.
@@ -278,7 +271,7 @@ code{
}code
-3~ Tweaking APT to save space
+3~tweaking-apt-to-save-space Tweaking APT to save space
You may find yourself needing to save some space on the image media, in which case one or the other or both of the following options may be of interest.
@@ -292,7 +285,7 @@ code{
This will not influence the entries in #{/etc/apt/sources.list}#, but merely whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is that APT needs those indices in order to operate in the live system, so before performing #{apt-cache search}# or #{apt-get install}#, for instance, the user must #{apt-get update}# first to create those indices.
-If you find the installation of recommended packages bloats your image too much, you may disable that default option of APT with:
+If you find the installation of recommended packages bloats your image too much, provided you are prepared to deal with the consequences discussed below, you may disable that default option of APT with:
code{
@@ -300,7 +293,9 @@ code{
}code
-The tradeoff here is that if you don't install recommended packages for a given package, that is, "packages that would be found together with this one in all but unusual installations" (Debian Policy Manual, section 7.2), some packages that you actually need may be omitted. Therefore, we suggest you review the difference turning off recommends makes to your packages list (see the #{binary.packages}# file generated by #{lb build}#) and re-include in your list any missing packages that you still want installed. Alternatively, if you find you only want a small number of recommended packages left out, leave recommends enabled and set a negative APT pin priority on selected packages to prevent them from being installed, as explained in {APT pinning}#apt-pinning.
+The most important consequence of turning off recommends is that #{live-boot}# and #{live-config}# themselves recommend some packages that provide important functionality used by most Live configurations, such as #{user-setup}# which #{live-config}# recommends and is used to create the live user. In all but the most exceptional circumstances you need to add back at least some of these recommends to your package lists or else your image will not work as expected, if at all. Look at the recommended packages for each of the #{live-*}# packages included in your build and if you are not certain you can omit them, add them back into your package lists.
+
+The more general consequence is that if you don't install recommended packages for any given package, that is, "packages that would be found together with this one in all but unusual installations" (Debian Policy Manual, section 7.2), some packages that users of your Live system actually need may be omitted. Therefore, we suggest you review the difference turning off recommends makes to your packages list (see the #{binary.packages}# file generated by #{lb build}#) and re-include in your list any missing packages that you still want installed. Alternatively, if you find you only want a small number of recommended packages left out, leave recommends enabled and set a negative APT pin priority on selected packages to prevent them from being installed, as explained in {APT pinning}#apt-pinning.
3~ Passing options to apt or aptitude
@@ -335,7 +330,7 @@ $ lb config --distribution wheezy
}code
-Negative pin priorities will prevent a package from being installed, as in the case where you do not want a package that is recommended by another package. Suppose you are building an LXDE image using #{--package-lists lxde}# option, but don't want the user prompted to store wifi passwords in the keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in turn recommends /{gnome-keyring}/. So you want to omit the recommended /{gnome-keyring}/ package. This can be done by adding the following stanza to #{config/chroot_apt/preferences}#:
+Negative pin priorities will prevent a package from being installed, as in the case where you do not want a package that is recommended by another package. Suppose you are building an LXDE image using #{task-lxde-desktop}# in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the user prompted to store wifi passwords in the keyring. This metapackage depends on /{lxde-core}/, which recommends /{gksu}/, which in turn recommends /{gnome-keyring}/. So you want to omit the recommended /{gnome-keyring}/ package. This can be done by adding the following stanza to #{config/chroot_apt/preferences}#:
code{
diff --git a/manual/en/user_customization-runtime.ssi b/manual/en/user_customization-runtime.ssi
index 6e021e7..56a0603 100644
--- a/manual/en/user_customization-runtime.ssi
+++ b/manual/en/user_customization-runtime.ssi
@@ -51,7 +51,7 @@ Multiple locales may be specified as a comma-delimited list.
This parameter, as well as the keyboard configuration parameters indicated below, can also be used at the kernel command line. You can specify a locale by #{language_country}# (in which case the default encoding is used) or the full #{language_country.encoding}# word. A list of supported locales and the encoding for each can be found in #{/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-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:
+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:
code{
@@ -83,16 +83,16 @@ However, for very specific use cases, you may wish to include other parameters.
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
}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-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:
+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:
code{
$ lb config --bootappend-live \
- "keyboard-layouts=us,us keyboard-variant=,dvorak"
+ "keyboard-layouts=us,us keyboard-variants=,dvorak"
}code
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index fcc2d44..caf6ef4 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -54,8 +54,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
@@ -96,7 +95,6 @@ code{
lb config noauto \
--architectures i386 \
--linux-flavours 686-pae \
- --package-lists lxde \
"${@}"
}code
@@ -113,11 +111,11 @@ 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 packages: /{iceweasel}/ and /{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}/.
Now, build the image:
@@ -183,19 +181,37 @@ We've come to the end of our tutorial series. While many more kinds of customiza
*{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 initial 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}#:
+As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you may need to re-add some recommended packages to make your image work properly.
+
+An easy way to list recommends is using /{apt-cache}/. For example:
+
+code{
+
+ $ apt-cache depends live-config live-boot
+
+}code
+
+In this example we found out that we had to re-include several packages recommended by live-config and live-boot: #{user-setup}# to make autologin work and #{sudo}# as an essential program to shutdown the system. Besides, it could be handy to add #{live-tools}# to be able to copy the image to RAM and #{eject}# to eventually eject the live media, So:
+
+code{
+
+$ echo "live-tools user-setup sudo eject" > config/package-lists/recommends.list.chroot
+
+}code
+
+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{
@@ -223,14 +239,22 @@ 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 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 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
-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.
+}code
+
+To make the image work properly, we must re-add, at least, two recommended packages which are left out by the #{--apt-recommends false}# option. See {Tweaking APT to save space}#tweaking-apt-to-save-space
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ echo "user-setup sudo" > config/package-lists/recommends.list.chroot
}code
@@ -242,9 +266,11 @@ 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. 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.chroot}# 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. 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.
+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
@@ -279,7 +305,7 @@ code{
}code
-At boot time we will generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. We will also need to preseed our desktop choice, "kde" so that tasksel will install the correct desktop task, as it differs from the default (see {Desktop and languages tasks}#desktop-and-language-tasks). Now let's put the pieces together:
+At boot time we will generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's put the pieces together. Recalling from {Using metapackages}#using-metapackages that task metapackages are prefixed #{task-}#, we just specify these language boot parameters, then add standard priority packages and all our discovered task metapackages to our package list as follows:
code{
@@ -290,10 +316,10 @@ code{
-k 486 \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
- brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
- $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
- $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \
+ task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot
}code
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index 7966c4b..c4aa502 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -10,11 +10,11 @@ _* Super user (root) access
_* An up-to-date version of live-build
-_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/.
+_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/
_* /{debootstrap}/ or /{cdebootstrap}/
-_* Linux 2.6.x
+_* Linux 2.6.x or 3.x
Note that using Debian or a Debian-derived distribution is not required - live-build will run on almost any distribution with the above requirements.
@@ -134,9 +134,16 @@ code{
}code
-_* Use all generated .deb files
+_* Use applicable generated .deb files
-As live-boot and live-config are installed by live-build system, installing the packages in the host system is not sufficient: you should treat the generated .deb files like any other custom packages. Please see {Customizing package installation}#customizing-package-installation for more information. You should pay particular attention to {Additional repositories}#additional-repositories.
+As live-boot and live-config are installed by live-build system, installing the packages in the host system is not sufficient: you should treat the generated .deb files like any other custom packages. Since your purpose for building from source is like to test new things over the short term before the official release, follow {Installing modified or third-party packages}#installing-modified-or-third-party-packages to temporarily include the relevant files in your configuration. In particular, notice that both packages are divided into a generic part, a documentation part and one or more back-ends. Include the generic part, only one back-end matching your configuration, and optionally the documentation. Assuming you are building a live image in the current directory and have generated all .deb files for a single version of both packages in the directory above, these bash commands would copy all of the relevant packages including default back-ends:
+
+code{
+
+ $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/
+ $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/
+
+}code
3~ From 'snapshots'
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
index 3aca901..318b005 100644
--- a/manual/en/user_managing_a_configuration.ssi
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -4,58 +4,75 @@
This chapter explains how to manage a live configuration from initial creation, through successive revisions and successive releases of both the live-build software and the live image itself.
-2~ Use auto to manage configuration changes
+2~ Dealing with 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.
+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.
-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.
+3~ Why use auto scripts? What do they do?
-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.
-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.
-2~ Example auto scripts
+3~ Use 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/*}#).
+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:
-#{auto/config}#
+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 --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 --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/en/user_overview.ssi b/manual/en/user_overview.ssi
index 6f3e319..38bf70e 100644
--- a/manual/en/user_overview.ssi
+++ b/manual/en/user_overview.ssi
@@ -35,19 +35,19 @@ Issuing #{lb config}# without any arguments creates a #{config/}# subdirectory w
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
Using #{lb config}# without any arguments would be suitable for users who need a very basic image, or who intend to later provide a more complete configuration via #{auto/config}# (see {Managing a configuration}#managing-a-configuration for details).
-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/es/live-manual.ssm b/manual/es/live-manual.ssm
index 8f764ab..b23cf9a 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,13 +9,13 @@
: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: 27.07.2012
+ :published: 2012-08-10
@publisher: Proyecto Debian Live <debian-live at lists.debian.org>
@make:
- :bold: /squeeze|wheezy|sid/
- :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|jessie|sid/
+ :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/es/project_bugs.ssi b/manual/es/project_bugs.ssi
index 9b8e859..d5413e3 100644
--- a/manual/es/project_bugs.ssi
+++ b/manual/es/project_bugs.ssi
@@ -3,7 +3,7 @@ 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
+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.
@@ -25,7 +25,7 @@ del sistema en vivo que se está construyendo.
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.
+especifica cualquiera de estas dos versiones como distribución objetivo.
% FIXME:
@@ -88,7 +88,7 @@ _* 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
+#{auto/build}# (ver {Gestionar una configuración}#managing-a-configuration
para más detalles).
code{
@@ -137,7 +137,7 @@ el error.
3~ En la preinstalación (bootstrap) en tiempo de creación.
-live-build arranca primero un sistema Debian básico con /{debootstrap}/ o
+live-build crea 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
@@ -145,9 +145,9 @@ específico de Debian (es lo más probable), o si está relacionado con la
herramienta de preinstalación en sí.
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.
+mismo, por lo cual el equipo de Debian Live probablemente no pueda
+solucionarlo directamente. Informar del error sobre la herramienta de
+preinstalación o el paquete que falla.
3~ Mientras se instalan paquetes en tiempo de creación.
@@ -169,7 +169,7 @@ preinstalando desde una réplica oficial.
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,
+hay que olvidar mencionar, cómo y cuando la imagen falla, si es 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
@@ -178,7 +178,7 @@ error también es muy útil.
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,
+sistema en vivo, esto es probablemente un error en Debian Live. Sin embargo:
2~ Hacer la investigación
diff --git a/manual/es/style_guide.ssi b/manual/es/style_guide.ssi
index 554c1b3..a8dc2df 100644
--- a/manual/es/style_guide.ssi
+++ b/manual/es/style_guide.ssi
@@ -327,20 +327,12 @@ that they use exactly the same markup as the original English version.
_* /{Code blocks}/
-Some translators decide to include the code blocks in the translated files
-because it is easier for them to identify what has already been translated
-and what has not by looking at the percentages if they use a graphical
-translation program.
-
-Include the code blocks if you want to score a 100% complete translation.
-
-On the other hand some translators prefer to leave the code blocks
-"untranslated" (i.e. not including them). This makes the translation easier
-to maintain once finished because it does not require translators
-intervention if the code changes.
-
-Leave the code blocks empty (they will be automatically added then) if you
-want to make your translation easier to maintain.
+Even though the code blocks are usually untranslatable, including them in
+the translation is the only way to score a 100% complete translation. And
+even though it means more work at first because it requires the intervention
+of the translators if the code changes, it is the best way, in the long run,
+to identify what has already been translated and what has not when checking
+the integrity of the .po files.
_* /{Newlines}/
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index ce9eb34..32b8bca 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -526,11 +526,11 @@ code{
memsize = "512"
MemAllowAutoScaleDown = "FALSE"
- ide0:0.present = "FALSE"
- ide1:0.present = "FALSE"
- floppy0.present = "FALSE"
- sound.present = "FALSE"
- tools.remindInstall = "FALSE"
+ #!/usr/bin/vmware
+ config.version = "8"
+ virtualHW.version = "4"
+ memsize = "512"
+ MemAllowAutoScaleDown = "FALSE"
ethernet0.present = "TRUE"
ethernet0.addressType = "generated"
diff --git a/manual/es/user_customization-contents.ssi b/manual/es/user_customization-contents.ssi
index f596092..fc7e0d4 100644
--- a/manual/es/user_customization-contents.ssi
+++ b/manual/es/user_customization-contents.ssi
@@ -18,7 +18,7 @@ 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
+cualquier fichero en la imagen Debian Live a crear. live-build tiene dos
mecanismos:
_* Includes locales en chroot : Estos includes permiten incluir o reemplazar
@@ -29,11 +29,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 +99,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
@@ -150,9 +128,8 @@ interesante examinar los scripts gancho que trae de serie live-config que
pueden verse en #{/lib/live/config/}# y fijarse en la secuencia de
números. Cuando se vaya a utilizar scripts propios deben ser prefijados con
un número para indicar el orden de ejecución. Otra posibilidad es utilizar
-un paquete personalizado tal y como se describe en {Instalar paquetes de
-terceros o paquetes
-modificados}#installing-modified-or-third-party-packages.
+un paquete personalizado tal y como se describe en {Instalar paquetes
+modificados o de terceros}#installing-modified-or-third-party-packages.
3~ Scripts gancho locales en Binary
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index b37e67f..3045928 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -13,15 +13,15 @@ disponibles para su instalación en la imagen. Para asegurar una buena
velocidad de descarga de paquetes, se debería elegir el repositorio Debian
más cercano. Se pueden añadir repositorios para backports, experimentales,
paquetes personalizados o incluir ficheros de paquetes directamente. Se
-pueden definir listas de paquetes personalizadas, utilizar listas
-predefinidas en live-build, seleccionar tareas de /{tasksel}/ o una
-combinación de los tres métodos. Por último existen varias opciones que dan
-algún control sobre cuando son instalados los paquetes por la herramienta
-/{apt}/ o la herramienta /{aptitude}/, según sea la elegida. Estas opciones
-pueden ser útiles si se utiliza un proxy, se quiere desactivar la
-instalación de paquetes recomendados para ahorrar espacio o se necesita
-controlar las versiones de los paquetes a instalar mediante APT pinning, por
-nombrar algunas posibilidades.
+pueden definir listas de paquetes personalizadas, incluyendo metapaquetes
+que instalarán muchos paquetes relacionados, como por ejemplo paquetes de un
+entorno de escritorio o lenguaje particular. Por último existen varias
+opciones que dan algún control sobre cuando son instalados los paquetes por
+la herramienta /{apt}/ o la herramienta /{aptitude}/, según sea la
+elegida. Estas opciones pueden ser útiles si se utiliza un proxy, se quiere
+desactivar la instalación de paquetes recomendados para ahorrar espacio o se
+necesita controlar las versiones de los paquetes a instalar mediante APT
+pinning, por nombrar algunas posibilidades.
2~ Origen de los paquetes
@@ -168,48 +168,81 @@ code{
Hay varias maneras de seleccionar qué paquetes serán instalados por
live-build en la imagen que cubren una variedad de necesidades diversas. Se
puede nombrar paquetes individuales para instalar en una lista de
-paquetes. También se puede seleccionar listas de paquetes predefinidos o
-incluso utilizar tareas de APT. Por último, también se pueden utilizar
-ficheros de paquetes de prueba o experimentales obtenidos antes de que
-aparezcan en los repositorios oficiales simplemente depositando estos
-ficheros directamente en el árbol de directorios #{config/}#.
+paquetes. También se puede utilizar metapaquetes en esas listas, o
+selecionarlas utilizando campos de ficheros de control de paquetes. Por
+último, también se pueden utilizar ficheros de paquetes de prueba o
+experimentales obtenidos antes de que aparezcan en los repositorios
+oficiales simplemente depositando estos ficheros directamente en el árbol de
+directorios #{config/}#.
3~package-lists Listas de paquetes
Las listas de paquetes proporcionan una potente forma de expresar qué
-paquetes deberían ser instalados. La sintaxis de la lista soporta la
+paquetes deberían ser instalados. La sintaxis de la listas soporta la
inclusión de ficheros y secciones condicionales, que facilitan la creación
de listas a partir de otras listas, adaptando su utilización a diversas
-configuraciones. También pueden utilizarse listas de paquetes predefinidas,
-dando una manera modular a la selección de paquetes para cada uno de los
-diferentes entornos de escritorios y algunas listas de propósito especial
-basadas en otras listas de propósito general. Puede utilizarse listas
-propias o una combinación de listas propias y listas predefinidas.
+configuraciones. También se pueden añadir nombre de paquetes en la listas
+utilizando shell helpers en tiempo de construcción.
*{Nota:}* El comportamiento de live-build cuando se especifica un paquete que no existe es determinado por lo que se haya configurado en la utilidad APT. Para más detalles ver {Utilizar apt o aptitude}#choosing-apt-or-aptitude.
-3~ Listas de paquetes predefinidas
+3~using-metapackages Using metapackages
-La forma más simple de utilizar listas de paquetes es especificar una o más
-listas predefinidas mediante la opción #{--package-lists}#, por ejemplo:
+La manera más sencilla de rellenar una lista de paquetes es utilizar una
+tarea metapaquete mantenida por una distribución. Por ejemplo:
code{
- $ lb config --package-lists "gnome rescue"
+ $ lb config
+ $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot
+
+}code
+
+Esto reemplaza el antiguo método de listas predefinidas compatible con
+#{live-build}# 2.x. A diferencia de las listas predefinidas, los
+metapaquetes de tareas no son específicos del proyecto Debian Live. Por el
+contrario, son mantenidas por grupos de especialistas que trabajan en la
+distribución y por lo tanto, reflejan el consenso de cada grupo acerca de
+qué paquetes sirven mejor a las necesidades de los usuarios. Además, abarcan
+una gama mucho más amplia de casos de uso que las listas predefinidas a las
+que sustituyen.
+
+Todos los metapaquetes de tareas tienen el prefijo #{task-}#, por lo que
+una forma rápida de determinar cuales están disponibles (aunque puede
+contener un puñado de entradas falsas que coincidan con el nombre, pero que
+no son metapaquetes) es buscar el nombre del paquete con:
+
+code{
+
+ $ apt-cache search --names-only ^task-
}code
-La ubicación por defecto de las listas de los ficheros en el sistema huésped
-es #{/usr/share/live/build/package-lists/}#. Para determinar qué paquetes
-componen una lista dada se debe leer el correspondiente fichero poniendo
-atención en los ficheros incluidos y en las secciones condicionales como se
-describen a continuación.
+Además de éstos, se encuentran otros metapaquetes con diversos
+fines. Algunos son subconjuntos de paquetes de tareas más amplias, como
+#{gnome-core}#, mientras que otros son partes especializadas individuales de
+un Debian Pure Blend, como los metapaquetes #{education-*}#. Para tener una
+lista de todos los metapaquetes en el archivo, instalar el paquete
+#{debtags}# y listar todos los paquetes con la etiqueta
+#{role::metapackage}# de la siguiente manera:
+
+code{
+
+ $ debtags search role::metapackage
+
+}code
3~ Listas de paquetes locales
-Se pueden añadir o reemplazar completamente las listas predefinidas
-depositando listas de paquetes locales en el directorio
-#{config/package-lists/}#.
+Ya sea incluyendo metapaquetes en una lista, paquetes individuales, o una
+combinación de ambos, todas las listas de paquetes locales se deben
+almacenar en #{config/package-lists/}#. Ya que se puede utilizar más de una
+lista, esto se presta muy bien a los diseños modulares. Por ejemplo, se
+puede dedicar una lista a una elección particular de escritorio, la otra a
+una colección de paquetes relacionados que puedan ser fácilmente utilizados
+sobre un escritorio diferente. Esto permite experimentar con diferentes
+combinaciones de conjuntos de paquetes con un mínimo esfuerzo, así como
+compartir listas comunes entre diferentes proyectos de imágenes en vivo.
Para que sean procesadas, las listas de paquetes que se depositen en este
directorio deben tener la extensión #{.list}# además de la extensión de la
@@ -228,22 +261,26 @@ 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~ Extensión de una lista de paquetes dada mediante «includes»
+3~generated-package-lists Generar listas de paquetes
-Las listas de paquetes predefinidas en live-build hacen un uso intensivo de
-las directivas «includes». Los ficheros existentes en el directorio
-#{/usr/share/live/build/package-lists/}# pueden servir como buen ejemplo de
-como escribir listas de paquetes.
+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
+comando que se ejecutará dentro del chroot cuando la imagen se
+construya. Por ejemplo, se podría incluir la línea #{! grep-aptavail -n
+-sPackage -FPriority standard | sort}# en una lista de paquetes para
+producir una lista ordenada de los paquetes disponibles con #{Priority:
+standard}#.
-Por ejemplo, para hacer una lista de paquetes que incluya la lista de
-paquetes predefinida #{gnome}# y añadir el paquete /{iceweasel}/ se puede
-crear un fichero llamado #{config/package-lists/my.list.chroot}# con el
-siguiente contenido:
+De hecho, la selección de paquetes con la orden #{grep-aptavail}# (del
+paquete #{dctrl-tools}#) es tan útil que #{live-build}# proporciona un
+script de ayuda llamado #{Packages}#. Este script acepta dos argumentos:
+#{field}# y #{pattern}#. Por lo tanto, se puede crear una lista con los
+siguientes contenidos:
code{
- #include <gnome>
- iceweasel
+ $ lb config
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
}code
@@ -307,29 +344,6 @@ code{
No se permite el anidamiento de estructuras condicionales.
-3~ Tareas
-
-El Instalador de Debian ofrece al usuario un conjunto de opciones con una
-lista de paquetes preseleccionada enfocadas a configurar un tipo de sistema
-o configurar el sistema para realizar una tarea como puede ser «Entorno de
-escritorio gráfico», «Servidor de correo», «Portátil», etc. Estas listas son
-llamadas «tareas» ("Tasks") y son soportadas por APT mediante el campo
-«Task:». Se puede especificar una o más tareas a live-build poniéndolas en
-una lista en #{config/task-lists/}#, como en el ejemplo siguiente.
-
-code{
-
- $ lb config
- $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
-
-}code
-
-Una vez ha sido arrancado el sistema en vivo puede conocerse qué tareas
-primarias están disponibles en el Instalador de Debian mediante la orden
-#{tasksel --list-tasks}#. La lista de paquetes contenidos en cualquier tarea
-(incluidas aquellas que no aparecen en la lista de tareas primarias) puede
-obtenerse mediante la orden #{tasksel --task-packages}#.
-
3~desktop-and-language-tasks Tareas de Escritorio e Idioma
Las tareas de escritorio y de idioma son casos especiales que necesitan un
@@ -351,39 +365,22 @@ una imagen en vivo no pueda ser creada para admitir múltiples escritorios o
varios idiomas y ofrecer al usuario una elección, pero ese no es un
comportamiento por defecto de live-build.
-Ya que no se ha previsto la instalación automática de tareas de idiomas, que
-incluyen cosas tales como tipos de letra específicos de cada lengua o
-paquetes de métodos de entrada, si se quiere incluirlos, es necesario
-especificarlo en la configuración. Por ejemplo, una imagen de escritorio
-GNOME que contenga soporte para el japonés podría incluir las siguientes
-tareas:
+Because there is no provision made automatically for language tasks, which
+include such things as language-specific fonts and input-method packages, if
+you want them, you need to specify them in your configuration. For example,
+a GNOME desktop image containing support for Japanese might include these
+task metapackages:
code{
$ lb config
- $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
- $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
+ $ echo "task-gnome-desktop task-laptop" >> config/package-lists/my.list.chroot
+ $ echo "task-japanese task-japanese-desktop task-japanese-gnome-desktop" >> config/package-lists/my.list.chroot
}code
-Ya que las tareas de escritorio son "internas", para cada tarea de sabor de
-escritorio incluido en la imagen, el valor correspondiente (si es diferente
-del predeterminado "gnome"), tiene que ser preconfigurado en la variable
-"tasksel/desktop" de lo contrario tasksel no lo va a reconocer e
-instalar. Por lo tanto:
-
-code{
-
- $ lb config
- $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
-
-}code
-
-Este parámetro puede tener varios valores, por ejemplo, "lxde xfce" en lugar
-de "kde".
-
-2~installing-modified-or-third-party-packages Instalar paquetes de terceros
-o paquetes modificados
+2~installing-modified-or-third-party-packages Instalar paquetes modificados
+o de terceros
Si bien está en contra de la filosofía de Debian Live, en ocasiones es
necesario crear un sistema en vivo con versiones de paquetes modificados a
@@ -497,7 +494,7 @@ code{
}code
-3~ Ajuste de APT para ahorrar espacio
+3~tweaking-apt-to-save-space Tweaking APT to save space
En ocasiones es necesario ahorrar un poco de espacio en el medio de
instalación. Las dos opciones descritas a continuación pueden ser de
@@ -520,9 +517,9 @@ que, si no existen, el usuario deberá ejecutar la orden #{apt-get update}#
para crear estos índices antes de poder ejecutar una orden del tipo
#{apt-cache search}# o #{apt-get install}#.
-Si la instalación de los paquetes recomendados aumenta demasiado el tamaño
-de la imagen, se puede desactivar el valor por defecto de esta opción de APT
-con:
+If you find the installation of recommended packages bloats your image too
+much, provided you are prepared to deal with the consequences discussed
+below, you may disable that default option of APT with:
code{
@@ -530,18 +527,27 @@ code{
}code
-Lo que está en juego aqui es que, si no se instalan los paquetes
-recomendados para un paquete dado, esto es «los paquetes que supuestamente
-deberían encontrase intalados si un paquete ya lo está» (Debian Policy
-Manual, seccion 7.2), algún paquete que supuestamente debería estar
-instalado será omitido. Por otra parte, se sugiere que, si se desactiva esta
-opción, se revise las recomendaciones hechas a la lista de paquetes indicada
-(ver el fichero #{binary.packages}# generado por #{lb build}#) y que se
-incluya en la lista cualquier paquete que deba ser instalado. Si se
-encuentra que el número de paquetes descartado es pequeño, se recomienda que
-la opción se active y que se utilice una prioridad negativa para el pin de
-APT en dichos paquetes y así evitar que sean instalados tal y como se
-explica en {APT pinning}#apt-pinning.
+The most important consequence of turning off recommends is that
+#{live-boot}# and #{live-config}# themselves recommend some packages that
+provide important functionality used by most Live configurations, such as
+#{user-setup}# which #{live-config}# recommends and is used to create the
+live user. In all but the most exceptional circumstances you need to add
+back at least some of these recommends to your package lists or else your
+image will not work as expected, if at all. Look at the recommended packages
+for each of the #{live-*}# packages included in your build and if you are
+not certain you can omit them, add them back into your package lists.
+
+The more general consequence is that if you don't install recommended
+packages for any given package, that is, "packages that would be found
+together with this one in all but unusual installations" (Debian Policy
+Manual, section 7.2), some packages that users of your Live system actually
+need may be omitted. Therefore, we suggest you review the difference turning
+off recommends makes to your packages list (see the #{binary.packages}# file
+generated by #{lb build}#) and re-include in your list any missing packages
+that you still want installed. Alternatively, if you find you only want a
+small number of recommended packages left out, leave recommends enabled and
+set a negative APT pin priority on selected packages to prevent them from
+being installed, as explained in {APT pinning}#apt-pinning.
3~ Pasar opciones a apt o a aptitude
@@ -593,12 +599,14 @@ $ lb config --distribution wheezy
Una prioridad pin negativa previene la instalación de un paquete, como puede
ser el caso de que no se desee que un paquete recomendado por otro sea
instalado al instalar el primero. Supongamos que se está creando una imagen
-LXDE mediante la opción #{--package-lists lxde}#, pero no se desea preguntar
-al usuario si desea almacenar las claves wifi en el almacen de claves. La
-lista lxde incluye /{gdm}/, la cual depende de /{gksu}/ que a su vez
-recomienda /{gnome-keyring}/. Así que el objetivo es omitir la instalación
-del paquete /{gnome-keyring}/, que puede conseguirse añadiendo un fichero
-con el siguiente contenido a #{config/chroot_apt/preferences}#:
+LXDE añadiendo #{task-lxde-desktop}# en
+#{config/package-lists/lxde-desktop.list.chroot}#, pero no se desea
+preguntar al usuario si desea almacenar las claves wifi en el almacen de
+claves. Este metapaquete depende de /{lxde-core}/, el cual recomienda
+/{gksu}/ que a su vez recomienda /{gnome-keyring}/. Así que el objetivo es
+omitir la instalación del paquete /{gnome-keyring}/, que puede conseguirse
+añadiendo un fichero con el siguiente contenido a
+#{config/chroot_apt/preferences}#:
code{
diff --git a/manual/es/user_customization-runtime.ssi b/manual/es/user_customization-runtime.ssi
index c3da032..398e617 100644
--- a/manual/es/user_customization-runtime.ssi
+++ b/manual/es/user_customization-runtime.ssi
@@ -85,7 +85,7 @@ variantes locales está en #{/usr/share/i18n/SUPPORTED}#.
#{live-config}# se encarga de la configuración del teclado de la consola y
del entorno gráfico X utilizando el paquete #{console-setup}#. Para
configurarlos se puede utilizar los parámetros de arranque
-#{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# y
+#{keyboard-layouts}#, #{keyboard-variants}#, #{keyboard-options}# y
#{keyboard-model}# a través de la opción #{--bootappend-live}#. Se puede
encontrar una lista de opciones válidas para estos parámetros en
#{/usr/share/X11/xkb/rules/base.lst}#. Para hallar la distribución del
@@ -127,7 +127,7 @@ TypeMatrix EZ-Reach 2030, utilizar:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
}code
@@ -136,16 +136,16 @@ se puede especificar varios valores separados por comas. A excepción de
#{keyboard-model}#, que sólo acepta un valor. En la página de manual
#{keyboard(5)}# se explican los detalles y algunos ejemplos de cómo utilizar
las variables #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# y
-#{XKBOPTIONS}#. Si se especifican diferentes valores en #{keyboard-variant}#
-estos se corresponderan uno a uno con los valores #{keyboard-layouts}# (ver
-#{setxkbmap(1)}# opción #{-variant}#). Se admiten valores vacíos; por
-ejemplo para definir dos distribuciones de teclado, la que se usa por
-omisión US QWERTY y otra US Dvorak, utilizar:
+#{XKBOPTIONS}#. Si se especifican diferentes valores en
+#{keyboard-variants}# estos se corresponderan uno a uno con los valores
+#{keyboard-layouts}# (ver #{setxkbmap(1)}# opción #{-variant}#). Se admiten
+valores vacíos; por ejemplo para definir dos distribuciones de teclado, la
+que se usa por omisión US QWERTY y otra US Dvorak, utilizar:
code{
$ lb config --bootappend-live \
- "keyboard-layouts=us,us keyboard-variant=,dvorak"
+ "keyboard-layouts=us,us keyboard-variants=,dvorak"
}code
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index 04d0351..f6036ee 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,17 @@ 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}/.
+En primer lugar con #{--architectures i386}# se asegura de que en un 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 el metapaquete /{lxde}/ para proporcionar
+un escritorio mínimo. Y, por último, se añaden dos paquetes iniciales
+favoritos: /{iceweasel}/ y /{xchat}/.
Ahora, crear la imagen:
@@ -260,24 +258,52 @@ 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 initial
+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}#:
+As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you
+may need to re-add some recommended packages to make your image work
+properly.
+
+An easy way to list recommends is using /{apt-cache}/. For example:
+
+code{
+
+ $ apt-cache depends live-config live-boot
+
+}code
+
+In this example we found out that we had to re-include several packages
+recommended by live-config and live-boot: #{user-setup}# to make autologin
+work and #{sudo}# as an essential program to shutdown the system. Besides,
+it could be handy to add #{live-tools}# to be able to copy the image to RAM
+and #{eject}# to eventually eject the live media, So:
+
+code{
+
+$ echo "live-tools user-setup sudo eject" >
+config/package-lists/recommends.list.chroot
+
+}code
+
+Crear el directorio #{/etc/skel}# en #{config/includes.chroot}# y poner
+dentro 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}#:
code{
@@ -305,7 +331,7 @@ 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.
+*{Caso Práctico:}* Crear una imagen estándar quitando algunos componentes para que quepa en un pendrive USB de 128M dejándo un poco de espacio libre para poder usarlo para lo que se quiera.
Al optimizar una imagen para adaptarla al tamaño de algunos medios de
almacenamiento, es necesario comprender el equilibrio que se está haciendo
@@ -313,15 +339,24 @@ 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.
+otro tipo de optimizaciones «intrusivas». Cabe destacar que para entender lo
+que hace el script gancho #{minimal.chroot}# se debería mirar en
+#{/usr/share/doc/live-build/examples/hooks}#
+
+code{
+
+ $ 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
+
+To make the image work properly, we must re-add, at least, two recommended
+packages which are left out by the #{--apt-recommends false}# option. See
+{Tweaking APT to save space}#tweaking-apt-to-save-space
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ echo "user-setup sudo" > config/package-lists/recommends.list.chroot
}code
@@ -334,24 +369,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
+anterior produjo una imagen de 95Mbytes. Esto se compara favorablemente en
+tamaño con la imagen de 182Mbytes 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.
+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.chroot}# hook removes some unused packages and files.
+
+Si se utilizan otros scripts gancho, como por ejemplo el script
+#{stripped.chroot}# que se encuentra en
+#{/usr/share/doc/live-build/examples/hooks}#, se puede reducir aún más el
+tamaño de la imagen hasta 76MB. Pero es necesario decidir si vale la pena la
+funcionalidad que se sacrifica con cada optimización del tamaño.
2~ Un escritorio KDE con variante local e instalador
@@ -394,12 +432,12 @@ code{
}code
-En el momento del arranque se van a generar las variantes locales
-pt_BR.UTF-8 y seleccionar la distribución del teclado pt-latin1. También
-será necesario preconfigurar la opción de escritorio, "kde" para que tasksel
-instale la tarea de escritorio correcta, ya que difiere de la de por defecto
-(Ver {Tareas de Escritorio e Idioma}#desktop-and-language-tasks). Ahora
-vamos a poner las piezas juntas:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. Now let's put the pieces together. Recalling from
+{Using metapackages}#using-metapackages that task metapackages are prefixed
+#{task-}#, we just specify these language boot parameters, then add standard
+priority packages and all our discovered task metapackages to our package
+list as follows:
code{
@@ -410,10 +448,10 @@ code{
-k 486 \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
- brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
- $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
- $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \
+ task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot
}code
diff --git a/manual/es/user_installation.ssi b/manual/es/user_installation.ssi
index f9dd2f9..57d97fa 100644
--- a/manual/es/user_installation.ssi
+++ b/manual/es/user_installation.ssi
@@ -12,11 +12,11 @@ _* Acceso de superusuario (root)
_* Una versión actualizada de live-build
_* Un intérprete de comandos compatible con POSIX, como por ejemplo /{bash}/
-o /{dash}/.
+o /{dash}/
_* /{debootstrap}/ o /{cdebootstrap}/
-_* Linux 2.6.x
+_* Linux 2.6.x o 3.x
Tener en cuenta que no es necesario el uso de Debian o una distribución
derivada de Debian - live-build funcionará en casi cualquier distribución
@@ -158,15 +158,31 @@ code{
}code
-_* Utilizar todos los ficheros .deb generados
+_* Utilizar los ficheros .deb generados que proceda
+
+Como live-boot y live-config son instalados por el sistema de construcción
+live-build, la instalación de esos paquetes en el sistema anfitrión no es
+suficiente: se debe tratar los .deb generados como si fueran paquetes
+personalizados. Puesto que el propósito de la construcción de estos paquetes
+a partir del código fuente es similar a probar cosas nuevas a corto plazo
+antes de su lanzamiento oficial, seguir las instrucciones de {Instalar
+paquetes modificados o de
+terceros}#installing-modified-or-third-party-packages para incluir
+temporalmente los ficheros necesarios en la configuración. En particular,
+observar que ambos paquetes se dividen en una parte genérica, una parte de
+documentación y uno o más back-ends. Incluir la parte genérica, sólo uno de
+los back-ends que coincida con la configuración, y, opcionalmente, la
+documentación. Suponiendo que se está construyendo una imagen en vivo en el
+directorio actual y se han generado todos los .deb para una única versión de
+los dos paquetes en el directorio superior, estos comandos bash copiaran
+todos los paquetes necesarios, incluyendo sus back-ends por defecto:
-Como live-boot y live-config son instalados por el sistema live-build, la
-instalación de estos paquetes en el sistema anfitrión no es suficiente: Se
-deben tratar los archivos .deb generados exáctamente igual que cualquier
-otro paquete personalizado. Véase {Personalización de la instalación de
-paquetes}#customizing-package-installation para más información. Se debe
-prestar especial atención a los {Repositorios
-adicionales}#additional-repositories.
+code{
+
+ $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/
+ $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/
+
+}code
3~ A partir de «instantáneas»
diff --git a/manual/es/user_managing_a_configuration.ssi b/manual/es/user_managing_a_configuration.ssi
index 910524d..b965ab2 100644
--- a/manual/es/user_managing_a_configuration.ssi
+++ b/manual/es/user_managing_a_configuration.ssi
@@ -7,102 +7,126 @@ en vivo desde el principio, pasando por sucesivas versiones tanto de la
herramienta live-build como de la imagen del sistema en vivo propiamente
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}#
+2~ Gestionar los cambios de configuración
+
+Las configuraciones en vivo rara vez son perfectas al primer intento. Puede
+estar bien pasar opciones a #{lb config}# en la línea de comandos para
+realizar una construcción única, pero es más típico revisar esas opciones y
+construir de nuevo hasta quedar satisfecho. Para apoyar estos cambios, se
+pueden utilizar scripts auto que garanticen que la configuración se mantiene
+en un estado coherente.
+
+3~ ¿Por qué utilizar scripts auto? ¿Qué hacen?
+
+El comando #{lb config}# almacena las opciones que se le pasan en ficheros
+en el directorio #{config/*}#, junto con muchas otras opciones que figuran
+en sus valores predeterminados. Si se ejecuta #{lb config}# una vez más, no
+restablecerá ninguna opción que se estableció como por defecto en función de
+las opciones iniciales. Así, por ejemplo, si se ejecuta #{lb config}# otra
+vez con un nuevo valor para #{--distribution}#, todas las opciones que se
+establecieron como predeterminadas para la distribución anteriormente ya no
+pueden funcionar con la nueva configuración. Estos archivos tampoco estan
+destinados a ser leídos o editados. Almacenan valores para más de cien
+opciones, para que nadie sea capaz de ver las opciones que se especificó
+realmente. Y por último, si se ejecuta #{lb config}# y a continuación se
+actualiza live-build y hay alguna opción que cambió de nombre, #{config/*}#
+todavía tendrá variables con las opciones viejas que ya no son válidas.
+
+Por todas estas razones, los scripts #{auto/*}# nos hacen la vida más
+fácil. Son simples envoltorios para los comandos #{lb config}#, #{lb build}#
+y #{lb clean}# diseñados para ayudar a administrar una configuración. El
+script #{auto/config}# contiene el comando #{lb config}# con todas las
+opciones que se desea, el script #{auto/clean}# elimina los ficheros que
+contienen variables de configuración y el fichero #{auto/build}# crea un
+#{build.log}# de cada creación. Cada uno de estos scripts se ejecuta
+automáticamente cada vez que se ejecuta la orden #{lb}#
+correspondiente. Mediante el uso de estos scripts, la configuración es más
+fácil de leer y se mantiene internamente coherente de una revisión a la
+siguiente. Además, será mucho más fácil identificar y corregir las opciones
+que necesitan cambiarse tras actualizar live-build y leer la documentación
+actualizada.
+
+2~ Usar scripts auto de ejemplo
+
+Para mayor comodidad, live-build contiene shell scripts auto de ejemplo que
+se pueden copiar y editar. Iniciar una nueva configuración por defecto y a
+continuación, copiar los ejemplos:
+
+code{
+
+ $ mkdir mylive && cd mylive && lb config
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
+
+}code
+
+Editar #{auto/config}#, añadiendo las opciones que se desee. Por ejemplo:
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}#
+Ahora, cada vez que se utilize #{lb config}#, #{auto/config}# reiniciará la
+configuración basándose en estas opciones. Cuando se desee realizar cambios,
+se deben editar las opciones en este fichero en lugar de pasarlas a #{lb
+config}#. Cuando se utilize #{lb clean}#, #{auto/clean}# limpiará los
+ficheros en #{config/*}# junto a los otros productos de construcción. Y, por
+último, cuando se utilice #{lb build}#, #{auto/build}# creará un log del
+proceso de construcción llamado #{build.log}#.
+
+Nota: Aquí se utiliza #{noauto}#, un parámetro especial para suprimir otra
+llamada a #{auto/config}#, evitando así una repetición infinita. Asegurarse
+de no eliminarlo accidentalmente al hacer cambios en el fichero. Tener
+cuidado al dividir el comando #{lb config}# en varias líneas para facilitar
+la lectura, como se muestra en el ejemplo anterior, ya que no debe olvidarse
+la barra invertida (\) al final de cada línea que sigue en la siguiente.
+
+2~ Clonar una configuración publicada a través de Git
+
+Utilizar la opción #{lb config --config}# para clonar un repositorio Git que
+contenga una configuración de Debian Live. Si se desea basar la
+configuración en una mantenida por el proyecto Debian Live, visitar los
+repositorios con el prefijo #{config-}# en http://live.debian.net/gitweb
+
+Por ejemplo, para construir una imagen de rescate, utilizar el repositorio
+#{config-rescue}# de la siguiente manera:
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 --config git://live.debian.net/git/config-rescue.git
}code
-#{auto/build}#
+Editar #{auto/config}#y cualquier otra cosa que se necesite en el árbol
+#{config}# para adaptarlo a las propias necesidades.
+
+Si se desea, se puede definir un método abreviado en la configuración de
+Git, añadiendo lo siguiente al fichero #{${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.
+Esto permite utilizar #{ldn:}# en cualquier lugar en que se tenga que
+especificar la dirección de un repositorio git de #{live.debian.net}#. Si se
+omite el sufijo #{.git}#, comenzar una nueva imagen con esta configuración
+es tan fácil como:
code{
- $ cp /usr/share/doc/live-build/examples/auto/* auto/
+ $ lb config --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..e93c37b 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
@@ -74,11 +74,12 @@ 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:
+especificar la distribución que se desea construir utilizando su nombre en
+clave:
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 e5ff735..664ec74 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -2,20 +2,20 @@
@title: Manuel Debian Live
- at creator: Debian Live Project <debian-live at lists.debian.org>
+ at creator: Projet Debian Live <debian-live at lists.debian.org>
@rights:
:copyright: Copyright (C) 2006-2012 Debian Live Project
: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: 27.07.2012
+ :published: 2012-08-10
- at publisher: Debian Live Project <debian-live at lists.debian.org>
+ at publisher: Projet Debian Live <debian-live at lists.debian.org>
@make:
- :bold: /squeeze|wheezy|sid/
- :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|jessie|sid/
+ :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index f48b7c7..01eeef6 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -4,9 +4,9 @@ B~ 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.
+un bogue. Il est préférable de remplir un rapport deux fois plus que
+jamais. Toutefois, ce chapitre contient des recommandations pour présenter
+des rapports de bogues.
Pour les impatients:
@@ -61,7 +61,7 @@ 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
+S'il vous plaît fournir assez d'informations avec votre rapport. Inclure 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
@@ -90,7 +90,7 @@ _* 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
+script #{auto/build}# (voir {Gestion d'une
configuration}#managing-a-configuration pour les détails).
code{
@@ -145,8 +145,9 @@ liée à un paquet Debian spécifique (plus probable), ou si elle est liée à
l'outil d'amorçage lui-même.
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.
+Debian lui-même que probablement nous ne pouvons pas le résoudre
+directement. S'il vous plaît rapportez un bogue sur l'outil d'amorçage ou du
+paquet défaillant.
3~ Au moment de la construction tandis l'installation de paquets
@@ -170,15 +171,15 @@ un miroir officiel.
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.
+comment/quand l'image a échoué, soit 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.
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,
+Si un paquet a été installé avec succès, mais il échoue tout en exécutant le
+système Live, c'est probablement un bogue dans Debian Live. Cependant:
2~ Faire les recherches
@@ -187,7 +188,7 @@ 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é.
+contournement a été proposée.
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
diff --git a/manual/fr/style_guide.ssi b/manual/fr/style_guide.ssi
index edd8e20..79a9560 100644
--- a/manual/fr/style_guide.ssi
+++ b/manual/fr/style_guide.ssi
@@ -327,20 +327,12 @@ that they use exactly the same markup as the original English version.
_* /{Code blocks}/
-Some translators decide to include the code blocks in the translated files
-because it is easier for them to identify what has already been translated
-and what has not by looking at the percentages if they use a graphical
-translation program.
-
-Include the code blocks if you want to score a 100% complete translation.
-
-On the other hand some translators prefer to leave the code blocks
-"untranslated" (i.e. not including them). This makes the translation easier
-to maintain once finished because it does not require translators
-intervention if the code changes.
-
-Leave the code blocks empty (they will be automatically added then) if you
-want to make your translation easier to maintain.
+Even though the code blocks are usually untranslatable, including them in
+the translation is the only way to score a 100% complete translation. And
+even though it means more work at first because it requires the intervention
+of the translators if the code changes, it is the best way, in the long run,
+to identify what has already been translated and what has not when checking
+the integrity of the .po files.
_* /{Newlines}/
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index f470586..59fa153 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -16,7 +16,7 @@ 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
+arbitraires dans votre image live de Debian. live-build prévoit deux
mécanismes pour leur utilisation:
_* Chroot local includes: Ils vous permettent d'ajouter ou remplacer des
@@ -28,11 +28,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 +92,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 286a805..410d966 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -13,15 +13,15 @@ de garantir des vitesses de téléchargement décentes, vous devez choisir un
miroir de distribution proche. Vous pouvez également ajouter vos propres
dépôts pour les backports, paquets expérimentaux ou personnalisés, ou
inclure des paquets directement en tant que fichiers. Vous pouvez définir
-vos propres listes de paquets à inclure, utiliser des listes prédéfinies de
-live-build, utiliser tâches /{tasksel}/, ou une combinaison des
-trois. Enfin, un certain nombre d'options donnent un certain contrôle sur
-/{apt}/, ou si vous préférez, /{aptitude}/, au moment de la construction
-quand les paquets sont installés. Vous pouvez trouver ces très pratique si
-vous utilisez un proxy, vous voulez désactiver l'installation des paquets
-recommandés pour économiser l'espace, ou avez besoin de contrôler quels
-versions des paquets sont installés via APT pinning, pour n'en nommer
-quelques possibilités.
+des listes de paquets, incluant les métapaquets qui installent nombreux
+paquets liés à la fois, telles que les paquets pour un ordinateur de bureau
+ou langue particulière. Enfin, un certain nombre d'options donnent un
+certain contrôle sur /{apt}/, ou si vous préférez, /{aptitude}/, au moment
+de la construction quand les paquets sont installés. Vous pouvez trouver ces
+très pratique si vous utilisez un proxy, vous voulez désactiver
+l'installation des paquets recommandés pour économiser l'espace, ou avez
+besoin de contrôler quels versions des paquets sont installés via APT
+pinning, pour n'en nommer quelques possibilités.
2~ Sources des paquets
@@ -160,50 +160,82 @@ code{
2~choosing-packages-to-install Choisir les paquets à installer
-Il y a un certain nombre de façons de choisir quels paquets live-build va
-installer dans votre image, couvrant une variété de besoins différents. Vous
-pouvez tout simplement nommer les paquets individuels à installer dans une
-liste de paquets. Vous pouvez également choisir grandes listes prédéfinies
-de paquets, ou utiliser des tâches APT. Et enfin, vous pouvez placer paquets
-dans votre arbre #{config/}# qui est bien adapté aux essais de nouveaux
-paquets ou expérimentaux avant qu'ils ne soient disponibles sur un dépôt.
+Il y a un certain nombre de façons pour choisir quels paquets live-build
+installera dans votre image, couvrant une variété de besoins
+différentes. Vous pouvez tout simplement nommer les paquets individuels à
+installer dans une liste de paquets. Vous pouvez également choisir
+métapaquets dans ces listes, ou sélectionner-les en utilisant des champs de
+paquets de contrôle de fichiers. Et enfin, vous pouvez placer paquets dans
+votre arbre #{config/}# qui est bien adapté aux essais de nouveaux paquets
+ou expérimentaux avant qu'ils ne soient disponibles sur un dépôt.
3~package-lists Listes de paquets
Les listes de paquets sont un excellent moyen d'exprimer quels paquets
doivent être installés. La syntaxe de la liste soutient les fichiers inclus
-et sections conditionnelles qui les rend facile de construire à partir
+et sections conditionnelles qui les rend faciles de construire à partir
d'autres listes et de les adapter pour une utilisation dans configurations
-multiples. Vous pouvez utiliser des listes de paquets prédéfinies, offrant
-une sélection modulaire de paquets provenants de chacun des environnements
-de bureau majeurs et certaines listes de but spécial, ainsi que les autres
-listes standard sont basées sur elles. Vous pouvez également fournir votre
-propre liste de paquets, ou utiliser une combinaison des deux.
+multiples. Les noms des paquets peuvent également être injectés dans la
+liste en utilisant assistants de shell au moment de la construction.
*{Remarque:}* Le comportement de live-build pour spécifier un paquet qui n'existe pas est déterminé par votre choix de l'utilité APT. Voir {Choisir apt ou aptitude}#choosing-apt-or-aptitude pour plus de détails.
-3~ Listes de paquets prédéfinies
+3~using-metapackages Using metapackages
-La façon la plus simple d'utiliser des listes consiste à spécifier une ou
-plusieurs listes prédéfinies avec la option #{--package-lists}#. Par
-exemple:
+La façon la plus simple pour remplir votre liste de paquets consiste à
+utiliser une tâche métapaquet maintenue par votre distribution. Par exemple:
code{
- $ lb config --package-lists "gnome rescue"
+ $ lb config
+ $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot
+
+}code
+
+Ceci remplace l'ancienne méthode des listes prédéfinies soutenue dans
+#{live-build}# 2.x. Contrairement aux listes prédéfinies, les métapaquets ne
+sont pas spécifiques du projet Debian Live. Au lieu de cela, ils sont
+maintenus par des groupes de travail spécialisés dans la distribution et
+reflètent donc le consensus de chaque groupe sur les paquets pour mieux
+servir les besoins des utilisateurs. Ils couvrent également une gamme
+beaucoup plus large des cas d'utilisation que les listes prédéfinies qu'ils
+remplacent.
+
+Tous les métapaquets de tâches sont préfixés avec #{task-}#, donc un moyen
+rapide pour déterminer lesquels sont disponibles (même si elle peut contenir
+une poignée de faux résultats qui correspondent avec le nom, mais ne sont
+pas métapaquets) est de faire correspondre le nom du paquet avec:
+
+code{
+
+ $ apt-cache search --names-only ^task-
}code
-L'emplacement par défaut pour les fichiers liste sur votre système est
-#{/usr/share/live/build/package-lists/}#. Pour déterminer les paquets dans
-une liste donnée, lire le fichier correspondant, en accordant une attention
-aux fichiers inclus et les conditionnels tels que décrits dans les sections
-suivantes.
+En plus, vous trouverez d'autres métapaquets à des fins diverses. Certains
+sont sous-ensembles de paquets de tâches plus larges, comme #{gnome-core}#,
+tandis que d'autres sont pièces individuelles spécialisées d'un Debian Pure
+Blend, comme les métapaquets #{education-*}#. Pour lister tous les
+métapaquets dans l'archive, installer le paquet #{debtags}# et lister tous
+les paquets avec le tag #{role::metapackage}# comme suit:
+
+code{
+
+ $ debtags search role::metapackage
+
+}code
3~ Listes de paquets locaux
-Vous pouvez compléter ou remplacer entièrement les listes fournies en
-utilisant listes de paquets locaux stockées dans #{config/package-lists/}#.
+Si vous ajoutez métapaquets dans une liste, des paquets individuels ou une
+combinaison des deux, toutes les listes de paquets locaux sont stockées dans
+#{config/package-lists/}#. Comme plus d'une liste peut être utilisée, cela
+se prête bien à une conception modulaire. Par exemple, vous pouvez décider
+de consacrer une liste à un choix particulier de bureau, l'autre à une
+collection de packages connexes qui pourraient aussi bien être utilisés
+au-dessus d'un bureau différent. Cela vous permet d'expérimenter avec
+différentes combinaisons d'ensembles de paquets avec un minimum de tracas en
+utilisant des listes communes entre les différents projets d'images live.
Les listes de paquets qui existent dans ce répertoire ont besoin d'avoir un
suffixe #{.list}# pour être traitées, puis un suffixe d'étape supplémentaire
@@ -222,21 +254,25 @@ 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~ Extension d'un liste de paquets fournis à l'aide de «includes»
+3~generated-package-lists Générer listes de paquets
-Les listes de paquets qui sont incluses avec live-build font un grand usage
-des «includes». Reportez-vous à celles-ci dans le répertoire
-#{/usr/share/live/build/package-lists/}#, car elles servent d'exemples pour
-savoir comment écrire vos propres listes.
+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
+indique une commande à exécuter dans le chroot lorsque l'image est
+construite. Par exemple, on pourrait inclure la ligne #{! grep-aptavail -n
+-sPackage -FPriority standard | sort}# dans une liste de paquets qui permet
+de produire une liste triée des paquets disponibles avec
-Par exemple, pour faire une liste qui comprend la liste prédéfinie
-#{gnome}#, plus /{iceweasel}/, créer #{config/package-lists/my.list.chroot}#
-avec le contenu suivant:
+En fait, la sélection des paquets avec la commande #{grep-aptavail}# (du
+paquet #{dctrl-tools}#) est si utile que #{live-build}# fournit un script
+#{Packages}# à titre de commodité. Ce script accepte deux arguments:
+#{field}# et #{pattern}#. Ainsi, vous pouvez créer une liste avec le contenu
+suivant:
code{
- #include <gnome>
- iceweasel
+ $ lb config
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
}code
@@ -297,29 +333,6 @@ code{
L'imbrication des conditionnels n'est pas soutenu.
-3~ Tâches
-
-L'installateur Debian offre l'utilisateur le choix d'un certain nombre de
-listes présélectionnées de paquets, chacune centrée sur un type particulier
-de système ou d'une tâche pour laquelle un système peut être utilisé, comme
-«environnement de bureau graphique», «serveur de messagerie» ou
-«portable». Ces listes sont appelés «tâches» (Tasks) et sont soutenues par
-APT grâce à l'option «Task:» Vous pouvez spécifier une ou plusieurs tâches à
-live-build en les plaçant dans une liste dans #{config/task-lists/}#, comme
-dans l'exemple ci-dessous.
-
-code{
-
- $ lb config
- $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
-
-}code
-
-Les tâches principales disponibles dans l'installateur Debian peuvent être
-listées avec #{tasksel --list-tasks}# dans le système live. Le contenu de
-n'importe quelle tâche, y compris celles non incluses dans cette liste,
-peuvent être examinées avec #{tasksel --task-packages}#.
-
3~desktop-and-language-tasks Tâches de bureau et de la langue
Les tâches de bureau et de la langue sont des cas particuliers qui ont
@@ -341,37 +354,20 @@ pour soutenir plusieurs environnements de bureau ou de plusieurs langues et
offrir à l'utilisateur un choix, mais ce n'est pas le comportement par
défaut de live-build.
-Parce qu'il n'y a pas aucune disposition faite automatiquement pour les
-tâches de la langue, qui comprennent des éléments tels que des polices
-spécifiques de la langue et des paquets de méthodes de saisie, si vous les
-voulez, vous devez les spécifier dans votre configuration. Par exemple, une
-image de bureau GNOME contenant soutien pour le japonais pourrait inclure
-les tâches suivantes:
+Because there is no provision made automatically for language tasks, which
+include such things as language-specific fonts and input-method packages, if
+you want them, you need to specify them in your configuration. For example,
+a GNOME desktop image containing support for Japanese might include these
+task metapackages:
code{
$ lb config
- $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
- $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
+ $ echo "task-gnome-desktop task-laptop" >> config/package-lists/my.list.chroot
+ $ echo "task-japanese task-japanese-desktop task-japanese-gnome-desktop" >> config/package-lists/my.list.chroot
}code
-Comme les tâches de bureau sont des tâches «internes», pour chaque tâche de
-saveur de bureau incluse dans l'image, la valeur correspondante, si elle
-diffère de la valeur par défaut, "gnome", doit être préconfigurée dans la
-variable debconf «tasksel/desktop", ou bien tasksel ne la reconnaîtra pas et
-ne l'installera pas. Ainsi:
-
-code{
-
- $ lb config
- $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
-
-}code
-
-Ce paramètre peut prendre plusieurs valeurs, par exemple "lxde xfce" au lieu
-de "kde".
-
2~installing-modified-or-third-party-packages Installation des paquets
modifiés ou de tiers
@@ -484,7 +480,7 @@ code{
}code
-3~ Régler APT pour économiser de l'espace
+3~tweaking-apt-to-save-space Tweaking APT to save space
Vous pouvez avoir besoin d'économiser de l'espace sur les supports d'images,
auquel cas l'un ou l'autre ou les deux options suivantes peuvent être
@@ -506,8 +502,9 @@ le système live, alors avant de procéder à #{apt-cache search}# ou #{apt-get
install}#, par exemple, l'utilisateur doit faire #{apt-get update}# pour
créer ces indices.
-Si vous trouvez que l'installation des paquets recommandés gonfle votre
-image trop, vous pouvez désactiver l'option par défaut d'APT avec:
+If you find the installation of recommended packages bloats your image too
+much, provided you are prepared to deal with the consequences discussed
+below, you may disable that default option of APT with:
code{
@@ -515,18 +512,27 @@ code{
}code
-La contrepartie ici est que si vous n'installez pas les paquets recommandés
-par un paquet, c’est-à-dire, "paquets qu'on trouverai avec celui-ci dans
-toute installation standard" (Debian Policy Manual, section 7.2), certains
-paquets que vous avez vraiment besoin peuvent être omis. Par conséquent,
-nous vous suggérons d'examiner la différence que désactiver recommends rend
-à votre liste de paquets (voir le fichier #{binary.packages}# généré par
-#{lb build}#) et re-incluez dans votre liste tous les paquets manquants que
-vous souhaitez toujours installés. Alternativement, si vous trouvez que vous
-voulez seulement un petit nombre de paquets recommandés exclus, laissez
-recommends activé et définissez une priorité APT pin négative sur les
-paquets sélectionnés pour éviter les installér, comme expliqué dans {APT
-pinning}#apt-pinning.
+The most important consequence of turning off recommends is that
+#{live-boot}# and #{live-config}# themselves recommend some packages that
+provide important functionality used by most Live configurations, such as
+#{user-setup}# which #{live-config}# recommends and is used to create the
+live user. In all but the most exceptional circumstances you need to add
+back at least some of these recommends to your package lists or else your
+image will not work as expected, if at all. Look at the recommended packages
+for each of the #{live-*}# packages included in your build and if you are
+not certain you can omit them, add them back into your package lists.
+
+The more general consequence is that if you don't install recommended
+packages for any given package, that is, "packages that would be found
+together with this one in all but unusual installations" (Debian Policy
+Manual, section 7.2), some packages that users of your Live system actually
+need may be omitted. Therefore, we suggest you review the difference turning
+off recommends makes to your packages list (see the #{binary.packages}# file
+generated by #{lb build}#) and re-include in your list any missing packages
+that you still want installed. Alternatively, if you find you only want a
+small number of recommended packages left out, leave recommends enabled and
+set a negative APT pin priority on selected packages to prevent them from
+being installed, as explained in {APT pinning}#apt-pinning.
3~ Passer des options à apt ou aptitude
@@ -576,13 +582,13 @@ $ lb config --distribution wheezy
Une priorité pin négative évitera installér un paquet, comme dans le cas où
vous ne voulez pas un paquet qui est recommandé par un autre
-paquet. Supposons que vous construisez une image LXDE en utilisant l'option
-#{--package-lists lxde}# mais ne veulez pas que l'utilisateur soit invité à
-stocker les mots de passe wifi dans le trousseau de clés. Cette liste
-comprend /{gdm}/, que dépend de /{gksu}/, que à son tour recommande
-/{gnome-keyring}/. Donc, vous voulez omettre le paquet recommandé
-/{gnome-keyring}/. Cela peut être fait en ajoutant la strophe suivante à
-#{config/chroot_apt/preferences}#:
+paquet. Supposons que vous construisez une image LXDE en utilisant
+#{task-lxde-desktop}# dans #{config/package-lists/lxde-desktop.list.chroot}#
+mais ne veulez pas que l'utilisateur soit invité à stocker les mots de passe
+wifi dans le trousseau de clés. Cette liste comprend /{lxde-core}/, qui
+recommande /{gksu}/, que à son tour recommande /{gnome-keyring}/. Donc, vous
+voulez omettre le paquet recommandé /{gnome-keyring}/. Cela peut être fait
+en ajoutant la strophe suivante à #{config/chroot_apt/preferences}#:
code{
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index dac3f1e..b836eb7 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -85,7 +85,7 @@ codage pour chacun peuvent être trouvés dans #{/usr/share/i18n/SUPPORTED}#.
La configuration du clavier pour la console et pour X est faite par
#{live-config}# en utilisant le paquet #{console-setup}#. Pour les
configurer, utiliser les paramètres de démarrage #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# et #{keyboard-model}# avec
+#{keyboard-variants}#, #{keyboard-options}# et #{keyboard-model}# avec
l'option #{--bootappend-live}#. On peut trouver options valides dans
#{/usr/share/X11/xkb/rules/base.lst}#. Pour trouver les dispositions el les
variantes correspondantes à une langue essayez de rechercher le nom anglais
@@ -126,7 +126,7 @@ EZ-Reach 2030, utiliser:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
}code
@@ -135,15 +135,15 @@ chacune des options #{keyboard-*}#, à l'exception de #{keyboard-model}#, qui
accepte une seule valeur. S'il vous plaît voir la page de manuel
#{keyboard(5)}# pour plus de détails et des exemples des variables
#{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# et #{XKBOPTIONS}#. Si plusieurs
-valeurs #{keyboard-variant}# sont données, elles seront jumelées tête à tête
-avec les valeurs #{keyboard-layouts}# voir #{setxkbmap(1)}# option
+valeurs #{keyboard-variants}# sont données, elles seront jumelées tête à
+tête avec les valeurs #{keyboard-layouts}# voir #{setxkbmap(1)}# option
#{-variant}#). On peut utiliser des valeurs vides; par exemple pour regler
deux dispositions, une par défaut US QWERTY et l'autre US Dvorak, utiliser:
code{
$ lb config --bootappend-live \
- "keyboard-layouts=us,us keyboard-variant=,dvorak"
+ "keyboard-layouts=us,us keyboard-variants=,dvorak"
}code
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 63ff18f..6293d5c 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,16 +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
+construction #{amd64}#, nous construisons une version de 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
+choisi la tâche métapaquet /{lxde}/ pour nous donner un bureau minimal. Et
enfin, nous avons ajouté deux premiers paquets préférés: /{iceweasel}/ et
/{xchat}/.
@@ -261,24 +259,52 @@ 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 initial
+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}#:
+As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you
+may need to re-add some recommended packages to make your image work
+properly.
+
+An easy way to list recommends is using /{apt-cache}/. For example:
+
+code{
+
+ $ apt-cache depends live-config live-boot
+
+}code
+
+In this example we found out that we had to re-include several packages
+recommended by live-config and live-boot: #{user-setup}# to make autologin
+work and #{sudo}# as an essential program to shutdown the system. Besides,
+it could be handy to add #{live-tools}# to be able to copy the image to RAM
+and #{eject}# to eventually eject the live media, So:
+
+code{
+
+$ echo "live-tools user-setup sudo eject" >
+config/package-lists/recommends.list.chroot
+
+}code
+
+Créez le répertoire #{/etc/skel}# dans #{config/includes.chroot}# avec un
+fichier #{.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}#:
code{
@@ -306,23 +332,32 @@ 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.
+*{Cas d'utilisation:}* Créer une image standard avec certains composants éliminés afin de l'adapter sur une clé USB de 128M avec un peu d'espace laissé pour l'utiliser à votre convenance.
+
+Pour l'optimisation d'une image adaptée à la dimension de 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". Afin de comprendre
+ce que le hook #{minimal.chroot}# fait, voir
+#{/usr/share/doc/live-build/examples/hooks}#
+
+code{
+
+ $ 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
-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é.
+To make the image work properly, we must re-add, at least, two recommended
+packages which are left out by the #{--apt-recommends false}# option. See
+{Tweaking APT to save space}#tweaking-apt-to-save-space
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ echo "user-setup sudo" > config/package-lists/recommends.list.chroot
}code
@@ -335,25 +370,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
+ci-dessus produisait une image de 95Mbyte. Cela se compare favorablement
+avec l'image de 182Mbyte 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é.
+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.chroot}# hook removes some unused packages and files.
+
+En utilisant d'autres hooks comme par exemple le hook #{stripped.chroot}#
+dans #{/usr/share/doc/live-build/examples/hooks}#, peut gagner de petites
+quantités supplémentaires d'espace et produire une image de 76MB. Mais c'est
+à vous de décider si la fonctionnalité qui est sacrifié à chaque
+optimisation de la taille vaut la perte de fonctionnalité.
2~ Un bureau KDE localisé et installateur
@@ -396,13 +433,12 @@ code{
}code
-Au démarrage nous allons générer les paramètres régionaux pt_BR.UTF-8 et
-sélectionner la configuration du clavier pt-latin1. Nous aurons aussi besoin
-de préconfigurer notre choix de bureau, "kde" de sorte que tasksel
-installera la tâche de bureau correcte, car elle diffère de la valeur par
-défaut (Voir {Tâches de bureau et de la
-langue}#desktop-and-language-tasks). Maintenant, nous allons assembler les
-pièces:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. Now let's put the pieces together. Recalling from
+{Using metapackages}#using-metapackages that task metapackages are prefixed
+#{task-}#, we just specify these language boot parameters, then add standard
+priority packages and all our discovered task metapackages to our package
+list as follows:
code{
@@ -413,10 +449,10 @@ code{
-k 486 \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
- brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
- $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
- $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \
+ task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot
}code
diff --git a/manual/fr/user_installation.ssi b/manual/fr/user_installation.ssi
index ab8fc20..2fc2c9e 100644
--- a/manual/fr/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -10,11 +10,11 @@ _* Super-utilisateur (root) accès
_* Une version mise à jour de live-build
-_* Un shell POSIX, tel que /{bash}/ ou /{dash}/.
+_* Un shell POSIX, tel que /{bash}/ ou /{dash}/
_* /{debootstrap}/ ou /{cdebootstrap}/
-_* Linux 2.6.x
+_* Linux 2.6.x ou 3.x
Notez que l'utilisation de Debian ou une distribution dérivée de Debian
n'est pas nécessaire - live-build fonctionne sur presque toute distribution
@@ -158,15 +158,30 @@ code{
}code
-_* Utilisez tous les fichiers .deb générés.
+_* Utilisez les fichiers .deb générés nécessaires.
+
+Comme live-boot and live-config sont installés par le système de
+construction live-build, l'installation de ces paquets dans le système hôte
+ne suffit pas: vous devez traiter les fichiers .deb générés comme d'autres
+paquets personnalisés. Comme votre objectif pour la construction à partir du
+code source est tester nouvelles choses à court terme avant la publication
+officielle, suivez {Installation de paquets modifiés ou de
+tiers}#installing-modified-or-third-party-packages pour inclure
+temporairement les pertinents dans votre configuration. En particulier,
+remarquez que les deux paquets sont divisés en une partie générique, une
+partie de documentation et un ou plusieurs back-ends. Inclure la partie
+générique, un seul back-end et éventuellement la documentation. En supposant
+que vous construisez une image live dans le répertoire courant et avez
+généré tous les fichiers .deb pour une version unique de deux paquets dans
+le répertoire ci-dessus, ces commandes bash seraient pour copier tous les
+paquets concernés, y compris par défaut les back-ends:
-Comme live-boot et live-config sont installés par le système live-build,
-l'installation des paquets dans le système hôte ne suffit pas: vous devez
-traiter les fichiers .deb générés comme aucun autre paquet
-personnalisé. S'il vous plaît voir {Personnalisation de l'installation de
-paquets}#customizing-package-installation pour plus d'informations. Vous
-devriez prêter une attention particulière à {Dépôts
-additionnels}#additional-repositories.
+code{
+
+ $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/
+ $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/
+
+}code
3~ À partir des instantanés
diff --git a/manual/fr/user_managing_a_configuration.ssi b/manual/fr/user_managing_a_configuration.ssi
index 05715b1..5e8e1da 100644
--- a/manual/fr/user_managing_a_configuration.ssi
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -6,94 +6,127 @@ Ce chapitre explique comment gérer une configuration d'un système live à
partir d'une création initiale, à travers des révisions successives et des
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}#
+2~ Traiter les modifications de configuration
+
+Les configurations live sont rarement parfaites du premier coup. Il peut
+être bon de passer des options #{lb config}# à partir de la ligne de
+commande pour effectuer une construction unique, mais il est plus typique de
+réviser ces options et de construire à nouveau jusqu'à ce que vous êtes
+satisfait. Afin de soutenir ces changements, vous aurez besoin des scripts
+automatiques qui assurent que votre configuration est maintenue dans un état
+cohérent.
+
+3~ Pourquoi utiliser des scripts auto? Que font-ils?
+
+La commande #{lb config}# enregistre les options que vous lui passez dans
+les fichiers dans #{config/*}# avec beaucoup d'autres options aux valeurs
+par défaut. Si vous exécutez #{lb config}# à nouveau, il ne réinitialisera
+pas l'option qui a été faite défaut en fonction de vos options
+initiales. Ainsi, par exemple, si vous exécutez #{lb config}# à nouveau avec
+une nouvelle valeur pour #{--distribution}#, toutes les options qui ont été
+dépendantes par défaut pour l'ancienne distribution ne peuvent plus
+fonctionner avec les nouveaux. Ces fichiers ne sont pas destinés à être lus
+ou édités. Ils enregistrent des valeurs pour plus d'une centaine d'options,
+afin que personne puisse voir dans ces options que vous avez réellement
+précisée.
+
+Pour toutes ces raisons, les scripts #{auto/*}# vous rendront la vie plus
+facile. Ils sont simples emballages pour les commandes #{lb config}#, #{lb
+build}# et #{lb clean}# qui sont conçus pour vous aider à gérer votre
+configuration. Le script #{auto/config}# enregistre votre commande #{lb
+config}# avec toutes les options désirées, le script #{auto/clean}# supprime
+les fichiers contenant les valeurs des variables de configuration, et le
+script #{auto/build}# crée un #{build.log}# de chaque construction. Et
+chaque fois que vous lancez la commande #{lb}# correspondante, ces fichiers
+seront exécutés automatiquement. En utilisant ces scripts, votre
+configuration est plus facile à lire et a une cohérence interne d'une
+révision à l'autre. En outre, il sera plus facile pour vous identifier et
+corriger les options qui doivent changer lorsque vous mettez à niveau
+live-build après avoir lu la documentation mise à jour.
+
+2~ Utilisez scripts auto d'exemple
+
+Pour votre commodité, live-build est fourni avec shell scripts d'exemple,
+pour copier et modifier. Lancer une nouvelle configuration par défaut, puis
+copier les exemples:
+
+code{
+
+ $ mkdir mylive && cd mylive && lb config
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
+
+}code
+
+Modifier #{auto/config}#, ajouter des options comme bon vous semble. Par
+exemple:
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}#
+Maintenant, chaque fois que vous utilisez #{lb config}#, #{auto/config}#
+réinitialisera la configuration basée sur ces options. Lorsque vous
+souhaitez effectuer des modifications, modifier les options dans ce fichier
+au lieu de les passer à #{lb config}#. Lorsque vous utilisez #{lb clean}#,
+#{auto/clean}# va nettoyer les fichiers ainsi que tous les autres produits
+de construction. Et enfin, lorsque vous utilisez #{lb build}# , un journal
+de la construction sera écrit par #{auto/build}# dans #{build.log}#.
+
+Remarque: Un paramètre spécial #{noauto}# est utilisé ici pour en éliminer
+un autre appel à #{auto/config}#, évitant ainsi une récursion
+infinie. Assurez-vous que vous ne l'avez pas accidentellement supprimé
+modifiant le fichier. Aussi, prenez soin d'assurer quand vous divisez la
+commande #{lb config}# sur plusieurs lignes pour une meilleure lisibilité,
+comme le montre l'exemple ci-dessus, que vous n'oubliez pas la barre oblique
+inverse (\) de sorte que chaque ligne continue à l'autre.
+
+2~ Cloner une configuration publiée via Git
+
+Utilisez l'option #{lb config --config}# pour cloner un dépôt Git qui
+contient une configuration de Debian Live. Si vous souhaitez baser votre
+configuration sur une maintenue par le projet Debian Live, voir les dépôts
+avec le préfixe #{config-}# sur http://live.debian.net/gitweb
+
+Par exemple, pour construire une image de récupération, utiliser le dépôt
+#{config-rescue}# comme suit:
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 --config git://live.debian.net/git/config-rescue.git
}code
-#{auto/build}#
+Modifier #{auto/config}# et toutes les autres choses dont vous avez besoin
+dans l'arbre #{config}# en fonction de vos besoins.
+
+Vous pouvez éventuellement définir un raccourci dans votre configuration Git
+en ajoutant la ligne suivante à votre #{${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.
+Cela vous permet d'utiliser # {ldn:} # partout où vous devez spécifier
+l'adresse d'un dépôt #{live.debian.net}# Si vous supprimez le suffixe
+optionnel #{.git}#, démarrer une nouvelle image en utilisant cette
+configuration est aussi simple que:
code{
- $ cp /usr/share/doc/live-build/examples/auto/* auto/
+ $ lb config --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..3735e03 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
@@ -75,11 +75,12 @@ d'offrir plus tard, une configuration plus complète via #{auto/config}#
détails).
Normalement, vous voulez spécifier certaines options. Par exemple, pour
-inclure la liste du paquet «gnome» dans votre configuration:
+spécifier la distribution que vous voulez construire en utilisant son nom de
+code:
code{
- $ lb config -p gnome
+ $ lb config --distribution sid
}code
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 021478e..3eda6d1 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,13 +9,13 @@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2012-07-27
+ :published: 2012-08-10
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /squeeze|wheezy|sid/
- :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|jessie|sid/
+ :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
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/style_guide.ssi b/manual/it/style_guide.ssi
index edd8e20..79a9560 100644
--- a/manual/it/style_guide.ssi
+++ b/manual/it/style_guide.ssi
@@ -327,20 +327,12 @@ that they use exactly the same markup as the original English version.
_* /{Code blocks}/
-Some translators decide to include the code blocks in the translated files
-because it is easier for them to identify what has already been translated
-and what has not by looking at the percentages if they use a graphical
-translation program.
-
-Include the code blocks if you want to score a 100% complete translation.
-
-On the other hand some translators prefer to leave the code blocks
-"untranslated" (i.e. not including them). This makes the translation easier
-to maintain once finished because it does not require translators
-intervention if the code changes.
-
-Leave the code blocks empty (they will be automatically added then) if you
-want to make your translation easier to maintain.
+Even though the code blocks are usually untranslatable, including them in
+the translation is the only way to score a 100% complete translation. And
+even though it means more work at first because it requires the intervention
+of the translators if the code changes, it is the best way, in the long run,
+to identify what has already been translated and what has not when checking
+the integrity of the .po files.
_* /{Newlines}/
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 7c7767d..398d64c 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -3,24 +3,21 @@
1~customizing-package-installation Personalizzare l'installazione dei
pacchetti
-Probabilmente la personalizzazione basilare di un sistema Debian Live è la
-scelta dei pacchetti da includere nell'immagine. Questo capitolo vi guiderà
-tra le varie opzioni in fase di costruzione per personalizzare
-l'installazione dei pacchetti di live-build. Le ampie scelte che influenzano
-quali pacchetti siano disponibili da installare nell'immagine sono le aree
-di distribuzione e archivio. Per essere sicuri di avere una ragionevole
-velocità di scaricamento, dovreste usare un mirror a voi vicino. Si possono
-inoltre aggiungere i propri repository per pacchetti di backport,
-sperimentali o personalizzati, o aggiungere i pacchetti direttamente come
-file. È possibile definire una propria lista di pacchetti da includere,
-usarne una predefinita di live-build, usare task di /{tasksel}/, o una
-combinazione di tutti e tre. Infine una serie di opzioni fornisce un certo
-controllo su /{apt}/, o /{aptitude}/ se si preferisce, in fase di
-compilazione quando i pacchetti sono installati. Ciò può tornare utile se si
-usa un proxy, se si vuole disabilitare l'installazione dei pacchetti
-raccomandati per risparmiare spazio o controllare quali versioni dei
-pacchetti vengono installate con il pinning, giusto per citare alcune
-possibilità.
+Perhaps the most basic customization of a Debian live system is the
+selection of packages to be included in the image. This chapter guides you
+through the various build-time options to customize live-build's
+installation of packages. The broadest choices influencing which packages
+are available to install in the image are the distribution and archive
+areas. To ensure decent download speeds, you should choose a nearby
+distribution mirror. You can also add your own repositories for backports,
+experimental or custom packages, or include packages directly as files. You
+can define lists of packages, including metapackages which will install many
+related packages at once, such as packages for a particular desktop or
+language. Finally, a number of options give some control over /{apt}/, or if
+you prefer, /{aptitude}/, at build time when packages are installed. You may
+find these handy if you use a proxy, want to disable installation of
+recommended packages to save space, or need to control which versions of
+packages are installed via APT pinning, to name a few possibilities.
2~ Sorgenti dei pacchetti
@@ -158,46 +155,78 @@ code{
2~choosing-packages-to-install Scegliere i pacchetti da installare
-Ci sono diversi modi per scegliere quali pacchetti live-build installerà
-nell'immagine, coprendo una gamma di esigenze diverse. Si possono richiamare
-i singoli pacchetti da un elenco o scegliere elenchi predefiniti di
-pacchetti oppure utilizzare i task di APT. E infine inserire i file dei
-pacchetti nell'albero #{config/}#, che ben si adatta a provare pacchetti
-nuovi o sperimentali prima che siano disponibili in un repository.
+There are a number of ways to choose which packages live-build will install
+in your image, covering a variety of different needs. You can simply name
+individual packages to install in a package list. You can also use
+metapackages in those lists, or select them using package control file
+fields. And finally, you may place package files in your #{config/}# tree,
+which is well suited to testing of new or experimental packages before they
+are available from a repository.
3~package-lists Elenchi di pacchetti
-Gli elenchi di pacchetti sono un potente mezzo per esprimere quali pacchetti
-devono essere installati. La sintassi gestisce file inclusi e sezioni
-condizionali rendendo semplice la creazione di elenchi da altri elenchi e
-adattarli per l'uso in molteplici configurazioni. Si può usare un elenco
-predefinito fornendo una selezione modulare dei pacchetti da ciascuno dei
-principali ambienti desktop e alcuni elenchi per uso speciale, così come
-elenchi standard sui quali vi si basano altri. È inoltre possibile fornire i
-propri elenchi o usare una combinazione di entrambi.
+Package lists are a powerful way of expressing which packages should be
+installed. The list syntax supports included files and conditional sections
+which makes it easy to build lists from other lists and adapt them for use
+in multiple configurations. Package names may also be injected into the list
+using shell helpers at build time.
*{Nota:}* quando si specifica un pacchetto che non esiste, il comportamento di live-build è determinato dalla scelta delle utilità di APT. Per ulteriori dettagli si veda {Scegliere apt o aptitude}#choosing-apt-or-aptitude.
-3~ Elenchi predefiniti di pacchetti
+3~using-metapackages Using metapackages
-Il modo più semplice per usare gli elenchi è di specificarne uno o più con
-l'opzione #{--package-lists}#. Per esempio:
+The simplest way to populate your package list is to use a task metapackage
+maintained by your distribution. For example:
code{
- $ lb config --package-lists "gnome rescue"
+ $ lb config
+ $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot
+
+}code
+
+This supercedes the older predefined list method supported in #{live-build}#
+2.x. Unlike predefined lists, task metapackages are not specific to the
+Debian Live project. Instead, they are maintained by specialist working
+groups within the distribution and therefore reflect the consensus of each
+group about which packages best serve the needs of the intended users. They
+also cover a much broader range of use cases than the predefined lists they
+replace.
+
+All task metapackages are prefixed #{task-}#, so a quick way to determine
+which are available (though it may contain a handful of false hits that
+match the name but aren't metapackages) is to match on the package name
+with:
+
+code{
+
+ $ apt-cache search --names-only ^task-
}code
-Il percorso predefinito per i file elenco sul sistema è
-#{/usr/share/live/build/package-lists/}#. Per determinare i pacchetti in un
-dato elenco, si legga il file corrispondente, prestando attenzione ai file
-inclusi e condizionali come descritto nella sezioni seguenti.
+In addition to these, you will find other metapackages with various
+purposes. Some are subsets of broader task packages, like #{gnome-core}#,
+while others are individual specialized parts of a Debian Pure Blend, such
+as the #{education-*}# metapackages. To list all metapackages in the
+archive, install the #{debtags}# package and list all packages with the
+#{role::metapackage}# tag as follows:
+
+code{
+
+ $ debtags search role::metapackage
+
+}code
3~ Elenchi locali dei pacchetti
-Gli elenchi predefiniti si possono integrare usando quelli locali dei
-pacchetti in #{config/package-lists/}#.
+Whether you list metapackages, individual packages, or a combination of
+both, all local package lists are stored in #{config/package-lists/}#. Since
+more than one list can be used, this lends itself well to modular
+designs. For example, you may decide to devote one list to a particular
+choice of desktop, another to a collection of related packages that might as
+easily be used on top of a different desktop. This allows you to experiment
+with different combinations of sets of packages with a minimum of fuss,
+sharing common lists between different live image projects.
Per essere processati, gli elenchi dei pacchetti che si trovano in questa
directory devono avere un suffisso #{.list}# e un suffisso #{.chroot}# o
@@ -214,21 +243,25 @@ 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~ Estendere un'elenco di pacchetti usando gli include
+3~generated-package-lists Generated package lists
-Gli elenchi di pacchetti inclusi in live-build fanno un notevole uso di
-include. Far riferimento a questi nella directory
-#{/usr/share/live/build/package-lists/}#, in quanto portano ottimi esempi su
-come scriverne di propri.
+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
+command to be executed within the chroot when the image is built. For
+example, one might include the line #{! grep-aptavail -n -sPackage
+-FPriority standard | sort}# in a package list to produce a sorted list of
+available packages with #{Priority: standard}#.
-Per esempio, per creare un elenco che includa quello predefinito di
-#{gnome}#più /{iceweasel}/, creare
-#{config/package-lists/mio.elenco.chroot}# con i seguenti contenuti:
+In fact, selecting packages with the #{grep-aptavail}# command (from the
+#{dctrl-tools}# package) is so useful that #{live-build}# provides a
+#{Packages}# helper script as a convenience. This script takes two
+arguments: #{field}# and #{pattern}#. Thus, you can create a list with the
+following contents:
code{
- #include <gnome>
- iceweasel
+ $ lb config
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
}code
@@ -289,28 +322,6 @@ code{
Le condizioni nidificate non sono supportate.
-3~ Task
-
-L'installatore Debian offre all'utente la scelta di vari elenchi di
-pacchetti pre-selezionati, ognuno dei quali focalizzato su un particolare
-tipo di sistema, o il tipo di attività per cui utilizzarlo, come "Graphical
-desktop environment", "Mail server" o "Laptop". Questi elenchi sono chiamati
-"task" e sono gestiti da APT attraverso il campo"Task:". In live-build si
-possono specificare uno o più task inserendoli in una lista in
-#{config/task-lists/}#, come nell'esempio seguente.
-
-code{
-
- $ lb config
- $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
-
-}code
-
-I task principali disponibili nell'installatore Debian possono essere
-elencati nel sistema live con #{tasksel --list-tasks}#. I contenuti di ogni
-task, inclusi quelli non inclusi in questo elenco, possono essere esaminati
-con #{tasksel --task-packages}#.
-
3~desktop-and-language-tasks Task per desktop e lingua
I task per i desktop e la lingua sono un caso particolare che necessita di
@@ -332,35 +343,20 @@ essere creata con un supporto per desktop o lingue multipli per offrire
all'utente una scelta, ma che non è il comportamento predefinito nella
creazione di una live.
-Poiché automaticamente non viene fatta alcuna preparazione sui task della
-lingua, i quali includono cose come caratteri specifici per la lingua e
-pacchetti per i metodi di input, se li si vogliono, vanno specificati nella
-configurazione. Per esempio, un'immagine del desktop GNOME contenente il
-supporto per il giapponese può includere questi task:
+Because there is no provision made automatically for language tasks, which
+include such things as language-specific fonts and input-method packages, if
+you want them, you need to specify them in your configuration. For example,
+a GNOME desktop image containing support for Japanese might include these
+task metapackages:
code{
$ lb config
- $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
- $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
+ $ echo "task-gnome-desktop task-laptop" >> config/package-lists/my.list.chroot
+ $ echo "task-japanese task-japanese-desktop task-japanese-gnome-desktop" >> config/package-lists/my.list.chroot
}code
-Dal momento che i task desktop sono "interni", bisogna preconfigurare ogni
-altro desktop da includere nell'immagine e diverso dal predefinito "gnome"
-nella variabile debconf "tasksel/desktop", altrimenti tasksel non li
-installerà:
-
-code{
-
- $ lb config
- $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
-
-}code
-
-Questo parametro supporta valori multipli, ad esempio "lxde xfce" invece di
-"kde".
-
2~installing-modified-or-third-party-packages Installare pacchetti
modificati o di terze parti
@@ -469,7 +465,7 @@ code{
}code
-3~ Modificare APT per risparmiare spazio
+3~tweaking-apt-to-save-space Tweaking APT to save space
Si può aver bisogno di risparmiare dello spazio sul supporto dell'immagine,
in tal caso una o entrambe delle seguenti opzioni possono essere
@@ -489,8 +485,9 @@ che APT necessita di quegli indici per operar enel sistema live, perciò
prima di eseguire #{apt-cache search}# o #{apt-get install}#, per esempio,
l'utente deve usare prima #{apt-get update}# per crearli.
-In caso si trovi che l'installazione dei pacchetti raccomandati appesantisca
-troppo l'immagine, si può disabilitare l'opzione predefinita di APT con:
+If you find the installation of recommended packages bloats your image too
+much, provided you are prepared to deal with the consequences discussed
+below, you may disable that default option of APT with:
code{
@@ -498,17 +495,27 @@ code{
}code
-Qui il compromesso è dato dal fatto che se non si installano i raccomandati
-per un certo pacchetto, ovvero "pacchetti che si trovano assieme a questo
-eccetto in installazioni non usuali" (Debian Policy Manual, paragrafo 7.2),
-saranno omessi alcuni di quelli realmente necessari. Si suggerisce pertanto
-di verificare la differenza ottenuta nel proprio elenco di pacchetti
-disabilitando i raccomandati (vedere il file #{binary.packages}# generato da
-#{lb build}#) e includere nuovamente in esso quelli omessi che si desiderano
-installare. In alternativa, se si desidera lasciare un modesto numero di
-raccomandati, li si lasci abilitati e si assegni ad APT un pin di priorità
-negativo sui pacchetti selezionati affinché non vengano installati, come
-spiegato in {APT pinning}#apt-pinning.
+The most important consequence of turning off recommends is that
+#{live-boot}# and #{live-config}# themselves recommend some packages that
+provide important functionality used by most Live configurations, such as
+#{user-setup}# which #{live-config}# recommends and is used to create the
+live user. In all but the most exceptional circumstances you need to add
+back at least some of these recommends to your package lists or else your
+image will not work as expected, if at all. Look at the recommended packages
+for each of the #{live-*}# packages included in your build and if you are
+not certain you can omit them, add them back into your package lists.
+
+The more general consequence is that if you don't install recommended
+packages for any given package, that is, "packages that would be found
+together with this one in all but unusual installations" (Debian Policy
+Manual, section 7.2), some packages that users of your Live system actually
+need may be omitted. Therefore, we suggest you review the difference turning
+off recommends makes to your packages list (see the #{binary.packages}# file
+generated by #{lb build}#) and re-include in your list any missing packages
+that you still want installed. Alternatively, if you find you only want a
+small number of recommended packages left out, leave recommends enabled and
+set a negative APT pin priority on selected packages to prevent them from
+being installed, as explained in {APT pinning}#apt-pinning.
3~ Passare opzioni ad apt o aptitude
@@ -554,14 +561,15 @@ $ lb config --distribution wheezy
}code
-Un valore negativo della priorità evita che un pacchetto venga installato,
-come nel caso in cui non se ne voglia uno raccomandato da un altro. Si
-suppone di costruire un'immagine di LXDE utilizzando l'opzione
-#{--package-lists lxde}# ma non si desidera che all'utente venga richiesto
-di salvare la password del wifi nel portachiavi. L'elenco include /{gdm}/
-che dipende da /{gksu}/ che a sua volta raccomanda /{gnome-keyring}/, in
-questo caso si vorrà omettere il pacchetto /{gnome-keyring}/ aggiungendo a
-#{config/chroot_apt/preferences}# la seguente definizione:
+Negative pin priorities will prevent a package from being installed, as in
+the case where you do not want a package that is recommended by another
+package. Suppose you are building an LXDE image using #{task-lxde-desktop}#
+in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the
+user prompted to store wifi passwords in the keyring. This metapackage
+depends on /{lxde-core}/, which recommends /{gksu}/, which in turn
+recommends /{gnome-keyring}/. So you want to omit the recommended
+/{gnome-keyring}/ package. This can be done by adding the following stanza
+to #{config/chroot_apt/preferences}#:
code{
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index ed6ca6c..aee0822 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -78,7 +78,7 @@ encoding for each can be found in #{/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-variant}#, #{keyboard-options}# and
+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
@@ -119,7 +119,7 @@ layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
}code
@@ -127,8 +127,8 @@ 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
+#{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:
@@ -136,7 +136,7 @@ Dvorak, use:
code{
$ lb config --bootappend-live \
- "keyboard-layouts=us,us keyboard-variant=,dvorak"
+ "keyboard-layouts=us,us keyboard-variants=,dvorak"
}code
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 6c365bd..cfdde7d 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,52 @@ 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 initial
+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}#:
+As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you
+may need to re-add some recommended packages to make your image work
+properly.
+
+An easy way to list recommends is using /{apt-cache}/. For example:
+
+code{
+
+ $ apt-cache depends live-config live-boot
+
+}code
+
+In this example we found out that we had to re-include several packages
+recommended by live-config and live-boot: #{user-setup}# to make autologin
+work and #{sudo}# as an essential program to shutdown the system. Besides,
+it could be handy to add #{live-tools}# to be able to copy the image to RAM
+and #{eject}# to eventually eject the live media, So:
+
+code{
+
+$ echo "live-tools user-setup sudo eject" >
+config/package-lists/recommends.list.chroot
+
+}code
+
+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 +325,31 @@ 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.
+
+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 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
+
+}code
-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.
+To make the image work properly, we must re-add, at least, two recommended
+packages which are left out by the #{--apt-recommends false}# option. See
+{Tweaking APT to save space}#tweaking-apt-to-save-space
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ echo "user-setup sudo" > config/package-lists/recommends.list.chroot
}code
@@ -328,23 +361,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.chroot}# 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
@@ -387,11 +424,12 @@ code{
}code
-Durante l'avvio verrà generata la localizzazione pt_BR.UTF-8 e selezionato
-il layout di tastiera pt-latin1. Ci sarà anche bisogno di preconfigurare la
-nostra scelta desktop, "kde" cosicché tasksel installerà il task corretto,
-che differisce dal predefinito (vedere {Task per desktop e
-lingua}#desktop-and-language-tasks). È ora di mettere insieme i pezzi:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. Now let's put the pieces together. Recalling from
+{Using metapackages}#using-metapackages that task metapackages are prefixed
+#{task-}#, we just specify these language boot parameters, then add standard
+priority packages and all our discovered task metapackages to our package
+list as follows:
code{
@@ -402,10 +440,10 @@ code{
-k 486 \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
- brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
- $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
- $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \
+ task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot
}code
diff --git a/manual/it/user_installation.ssi b/manual/it/user_installation.ssi
index 197ff4f..0a45824 100644
--- a/manual/it/user_installation.ssi
+++ b/manual/it/user_installation.ssi
@@ -11,11 +11,11 @@ _* Accesso come utente root
_* Una versione aggiornata di live-build
-_* Una shell POSIX-compliant, come /{bash}/ o /{dash}/.
+_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/
_* /{debootstrap}/ o /{cdebootstrap}/
-_* Linux 2.6.x
+_* Linux 2.6.x or 3.x
Si noti che usare Debian o una distribuzione derivata Debian non è richiesto
- live-build funzionerà sostanzialmente su qualsiasi distribuzione che
@@ -156,14 +156,28 @@ code{
}code
-_* Usare il .deb di live-boot generato
+_* Use applicable generated .deb files
+
+As live-boot and live-config are installed by live-build system, installing
+the packages in the host system is not sufficient: you should treat the
+generated .deb files like any other custom packages. Since your purpose for
+building from source is like to test new things over the short term before
+the official release, follow {Installing modified or third-party
+packages}#installing-modified-or-third-party-packages to temporarily include
+the relevant files in your configuration. In particular, notice that both
+packages are divided into a generic part, a documentation part and one or
+more back-ends. Include the generic part, only one back-end matching your
+configuration, and optionally the documentation. Assuming you are building a
+live image in the current directory and have generated all .deb files for a
+single version of both packages in the directory above, these bash commands
+would copy all of the relevant packages including default back-ends:
-Siccome live-boot e live-config sono installati dal sistema live-build,
-installare il pacchetto nel sistema host non è sufficiente: occorre trattare
-il .deb generato come un qualsiasi altro pacchetto creato su misura. Per
-maggiori informazioni si veda {Personalizzare l'installazione dei
-pacchetti}#customizing-package-installation. Si presti particolare
-attenzione a {Repository aggiuntivi}#additional-repositories.
+code{
+
+ $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/
+ $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/
+
+}code
3~ Da "istantanee"
diff --git a/manual/it/user_managing_a_configuration.ssi b/manual/it/user_managing_a_configuration.ssi
index acce0ce..be4b111 100644
--- a/manual/it/user_managing_a_configuration.ssi
+++ b/manual/it/user_managing_a_configuration.ssi
@@ -6,90 +6,121 @@ Questo capitolo spiega come gestire una configurazione per una live sin
dalla creazione iniziale, attraverso le successive revisioni e rilasci sia
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}#
+2~ Dealing with configuration changes
+
+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 use auto scripts? What do they do?
+
+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 --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 --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/about_manual.ssi.po b/manual/po/ca/about_manual.ssi.po
index 7cc33af..494e66a 100644
--- a/manual/po/ca/about_manual.ssi.po
+++ b/manual/po/ca/about_manual.ssi.po
@@ -625,7 +625,7 @@ msgstr "O combinar tot dos, per exemple:"
#: en/about_manual.ssi:130
#, no-wrap
msgid " $ make build LANGUAGES=it FORMATS=html\n"
-msgstr ""
+msgstr " $ make build LANGUAGES=it FORMATS=html\n"
#. type: Plain text
#: en/about_manual.ssi:134
diff --git a/manual/po/ca/live-manual.ssm.po b/manual/po/ca/live-manual.ssm.po
index ff68650..2421512 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-07-27 00:01+0300\n"
+"POT-Creation-Date: 2012-08-10 22:48+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-07-27\n"
+" :published: 2012-08-10\n"
msgstr ""
"@date:\n"
" :published: 2012-07-27\n"
@@ -65,14 +65,14 @@ msgstr "@publisher: Projecte Debian Live <debian-live at lists.debian.org>"
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /squeeze|wheezy|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|jessie|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
"@make:\n"
-" :bold: /squeeze|wheezy|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|jessie|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\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/style_guide.ssi.po b/manual/po/ca/style_guide.ssi.po
index 5d9721b..8196ab5 100644
--- a/manual/po/ca/style_guide.ssi.po
+++ b/manual/po/ca/style_guide.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 17:04+0300\n"
+"POT-Creation-Date: 2012-07-31 23:27+0300\n"
"PO-Revision-Date: 2012-06-03 17:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -23,7 +23,7 @@ msgstr ":B~ Apèndix"
#: 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
@@ -49,33 +49,35 @@ msgstr ":B~ Apèndix"
#: 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: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: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:218
+#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
#: 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:350
+#: en/user_customization-packages.ssi:358 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: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_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
@@ -93,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
@@ -118,34 +120,36 @@ msgstr "code{"
#: 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:206
+#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:363 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: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_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
@@ -798,41 +802,21 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:220
msgid ""
-"Some translators decide to include the code blocks in the translated files "
-"because it is easier for them to identify what has already been translated "
-"and what has not by looking at the percentages if they use a graphical "
-"translation program."
+"Even though the code blocks are usually untranslatable, including them in "
+"the translation is the only way to score a 100% complete translation. And "
+"even though it means more work at first because it requires the intervention "
+"of the translators if the code changes, it is the best way, in the long run, "
+"to identify what has already been translated and what has not when checking "
+"the integrity of the .po files."
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:222
-msgid ""
-"Include the code blocks if you want to score a 100% complete translation."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:224
-msgid ""
-"On the other hand some translators prefer to leave the code blocks "
-"\"untranslated\" (i.e. not including them). This makes the translation "
-"easier to maintain once finished because it does not require translators "
-"intervention if the code changes."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:226
-msgid ""
-"Leave the code blocks empty (they will be automatically added then) if you "
-"want to make your translation easier to maintain."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:228
msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:230
+#: en/style_guide.ssi:224
msgid ""
"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
@@ -841,48 +825,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:232
+#: en/style_guide.ssi:226
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:234
+#: en/style_guide.ssi:228
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:236
+#: en/style_guide.ssi:230
msgid "Translators should never translate:"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:238
+#: en/style_guide.ssi:232
msgid "The code names of releases"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:240
+#: en/style_guide.ssi:234
msgid "The names of programs"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:242
+#: en/style_guide.ssi:236
msgid "The commands given as examples"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:244
+#: en/style_guide.ssi:238
msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:246
+#: en/style_guide.ssi:240
msgid "Links"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:247
+#: en/style_guide.ssi:241
msgid "Paths"
msgstr ""
diff --git a/manual/po/ca/user_basics.ssi.po b/manual/po/ca/user_basics.ssi.po
index 76b091a..58a975b 100644
--- a/manual/po/ca/user_basics.ssi.po
+++ b/manual/po/ca/user_basics.ssi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-07-18 19:47+0300\n"
-"PO-Revision-Date: 2012-06-24 17:14+0200\n"
+"PO-Revision-Date: 2012-08-07 01:28+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
"Language: Catalan\n"
@@ -339,7 +339,7 @@ msgstr ""
#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
-msgstr ""
+msgstr " $ lb config\n"
#. type: Plain text
#: en/user_basics.ssi:38
@@ -365,7 +365,7 @@ msgstr ""
#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
-msgstr ""
+msgstr " # lb build\n"
#. type: Plain text
#: en/user_basics.ssi:48
@@ -414,13 +414,13 @@ msgstr ""
#: en/user_basics.ssi:60
#, no-wrap
msgid " # apt-get install wodim\n"
-msgstr ""
+msgstr " # apt-get install wodim\n"
#. type: Plain text
#: en/user_basics.ssi:62
#, no-wrap
msgid " $ wodim binary.hybrid.iso\n"
-msgstr ""
+msgstr " $ wodim binary.hybrid.iso\n"
#. type: Plain text
#: en/user_basics.ssi:66
@@ -466,7 +466,7 @@ msgstr ""
#: en/user_basics.ssi:75
#, no-wrap
msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
-msgstr ""
+msgstr " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
#. type: Plain text
#: en/user_basics.ssi:80
@@ -625,7 +625,7 @@ msgstr ""
#: en/user_basics.ssi:110
#, no-wrap
msgid " # apt-get install qemu-kvm qemu-utils\n"
-msgstr ""
+msgstr " # apt-get install qemu-kvm qemu-utils\n"
#. type: Plain text
#: en/user_basics.ssi:114
@@ -636,7 +636,7 @@ msgstr "Arrencar una imatge ISO és senzill:"
#: en/user_basics.ssi:118
#, no-wrap
msgid " $ kvm -cdrom binary.hybrid.iso\n"
-msgstr ""
+msgstr " $ kvm -cdrom binary.hybrid.iso\n"
#. type: Plain text
#: en/user_basics.ssi:122
@@ -657,13 +657,13 @@ msgstr "Per provar la ISO amb /{virtualbox-ose}/:"
#: en/user_basics.ssi:130
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
-msgstr ""
+msgstr " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
#. type: Plain text
#: en/user_basics.ssi:132
#, no-wrap
msgid " $ virtualbox\n"
-msgstr ""
+msgstr " $ virtualbox\n"
#. type: Plain text
#: en/user_basics.ssi:136
@@ -684,7 +684,7 @@ msgstr "*{Nota:}* Per provar sistemes vius que contenen X.org amb /{virtualbox-o
#: en/user_basics.ssi:142
#, no-wrap
msgid " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
-msgstr ""
+msgstr " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
#. type: Plain text
#: en/user_basics.ssi:146
@@ -723,7 +723,7 @@ msgstr "*{Nota:}* si s'ha creat una imatge ISO híbrida amb l'exemple anterior,
#: en/user_basics.ssi:154 en/user_basics.ssi:220
#, no-wrap
msgid " # lb clean --binary\n"
-msgstr ""
+msgstr " # lb clean --binary\n"
#. type: Plain text
#: en/user_basics.ssi:158
@@ -738,7 +738,7 @@ msgstr ""
#: en/user_basics.ssi:162
#, no-wrap
msgid " $ lb config -b hdd\n"
-msgstr ""
+msgstr " $ lb config -b hdd\n"
#. type: Plain text
#: en/user_basics.ssi:166 en/user_basics.ssi:234
@@ -797,7 +797,7 @@ msgstr ""
#: en/user_basics.ssi:186
#, no-wrap
msgid " $ kvm -hda binary.img\n"
-msgstr ""
+msgstr " $ kvm -hda binary.img\n"
#. type: Plain text
#: en/user_basics.ssi:190
@@ -821,7 +821,7 @@ msgstr ""
#: en/user_basics.ssi:196
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
-msgstr ""
+msgstr " # gparted ${USBSTICK}\n"
#. type: Plain text
#: en/user_basics.ssi:200
@@ -838,7 +838,7 @@ msgstr ""
#: en/user_basics.ssi:204
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
-msgstr ""
+msgstr " # mkfs.ext4 ${PARTITION}\n"
#. type: Plain text
#: en/user_basics.ssi:208
@@ -886,7 +886,7 @@ msgstr ""
#: en/user_basics.ssi:228
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
-msgstr ""
+msgstr " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
#. type: Plain text
#: en/user_basics.ssi:232
@@ -973,13 +973,13 @@ msgstr ""
#: en/user_basics.ssi:256
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
-msgstr ""
+msgstr " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
#. type: Plain text
#: en/user_basics.ssi:258
#, no-wrap
msgid " ddns-update-style none;\n"
-msgstr ""
+msgstr " ddns-update-style none;\n"
#. type: Plain text
#: en/user_basics.ssi:261
@@ -988,6 +988,8 @@ msgid ""
" option domain-name \"example.org\";\n"
" option domain-name-servers ns1.example.org, ns2.example.org;\n"
msgstr ""
+" option domain-name \"example.org\";\n"
+" option domain-name-servers ns1.example.org, ns2.example.org;\n"
#. type: Plain text
#: en/user_basics.ssi:264
@@ -996,12 +998,14 @@ msgid ""
" default-lease-time 600;\n"
" max-lease-time 7200;\n"
msgstr ""
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
#. type: Plain text
#: en/user_basics.ssi:266
#, no-wrap
msgid " log-facility local7;\n"
-msgstr ""
+msgstr " log-facility local7;\n"
#. type: Plain text
#: en/user_basics.ssi:272
@@ -1013,6 +1017,11 @@ msgid ""
" filename \"pxelinux.0\";\n"
"}\n"
msgstr ""
+" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+" range 192.168.0.1 192.168.0.254;\n"
+" next-server servername;\n"
+" filename \"pxelinux.0\";\n"
+"}\n"
#. type: Plain text
#: en/user_basics.ssi:276
@@ -1043,7 +1052,7 @@ msgstr ""
#: en/user_basics.ssi:284
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
-msgstr ""
+msgstr " # dpkg-reconfigure -plow tftpd-hpa\n"
#. type: Plain text
#: en/user_basics.ssi:288
@@ -1084,7 +1093,7 @@ msgstr ""
#: en/user_basics.ssi:300
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
-msgstr ""
+msgstr " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
#. type: Plain text
#: en/user_basics.ssi:304
@@ -1098,7 +1107,7 @@ msgstr ""
#: en/user_basics.ssi:308
#, no-wrap
msgid " # exportfs -rv\n"
-msgstr ""
+msgstr " # exportfs -rv\n"
#. type: Plain text
#: en/user_basics.ssi:312
@@ -1168,6 +1177,14 @@ msgid ""
" sudo /usr/sbin/brctl addif br0 $1\n"
" sleep 2\n"
msgstr ""
+" #!/bin/sh\n"
+" sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
+" echo \"Executing /etc/qemu-ifup\"\n"
+" echo \"Bringing up $1 for bridged mode...\"\n"
+" sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
+" echo \"Adding $1 to br0...\"\n"
+" sudo /usr/sbin/brctl addif br0 $1\n"
+" sleep 2\n"
#. type: Plain text
#: en/user_basics.ssi:339
@@ -1215,6 +1232,11 @@ msgid ""
" memsize = \"512\"\n"
" MemAllowAutoScaleDown = \"FALSE\"\n"
msgstr ""
+" #!/usr/bin/vmware\n"
+" config.version = \"8\"\n"
+" virtualHW.version = \"4\"\n"
+" memsize = \"512\"\n"
+" MemAllowAutoScaleDown = \"FALSE\"\n"
#. type: Plain text
#: en/user_basics.ssi:363
@@ -1226,6 +1248,11 @@ msgid ""
" sound.present = \"FALSE\"\n"
" tools.remindInstall = \"FALSE\"\n"
msgstr ""
+" ide0:0.present = \"FALSE\"\n"
+" ide1:0.present = \"FALSE\"\n"
+" floppy0.present = \"FALSE\"\n"
+" sound.present = \"FALSE\"\n"
+" tools.remindInstall = \"FALSE\"\n"
#. type: Plain text
#: en/user_basics.ssi:366
@@ -1234,6 +1261,8 @@ msgid ""
" ethernet0.present = \"TRUE\"\n"
" ethernet0.addressType = \"generated\"\n"
msgstr ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
#. type: Plain text
#: en/user_basics.ssi:369
@@ -1242,6 +1271,8 @@ msgid ""
" displayName = \"Test Boot PXE\"\n"
" guestOS = \"other\"\n"
msgstr ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
#. type: Plain text
#: en/user_basics.ssi:374
@@ -1252,6 +1283,10 @@ msgid ""
" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
" ethernet0.generatedAddressOffset = \"0\"\n"
msgstr ""
+" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
+" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" ethernet0.generatedAddressOffset = \"0\"\n"
#. type: Plain text
#: en/user_basics.ssi:378
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 12246a3..6b25fea 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-04-14 22:45+0300\n"
-"PO-Revision-Date: 2012-07-19 14:40+0200\n"
+"POT-Creation-Date: 2012-08-10 22:48+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"
@@ -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-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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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-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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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"
@@ -178,10 +180,10 @@ msgid ""
"areas. To ensure decent download speeds, you should choose a nearby "
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
-"can define your own lists of packages to include, use live-build's "
-"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
-"Finally, a number of options give some control over /{apt}/, or if you "
-"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"can define lists of packages, including metapackages which will install many "
+"related packages at once, such as packages for a particular desktop or "
+"language. Finally, a number of options give some control over /{apt}/, or if "
+"you prefer, /{aptitude}/, at build time when packages are installed. You may "
"find these handy if you use a proxy, want to disable installation of "
"recommended packages to save space, or need to control which versions of "
"packages are installed via APT pinning, to name a few possibilities."
@@ -194,15 +196,15 @@ msgstr ""
"de distribució i el arxiu. Per garantir velocitats de descàrrega decents, "
"s'ha de triar un mirall de distribució proper. També es pot incloure "
"repositoris de backports, paquets experimentals o personalitzats, o incloure "
-"paquets directament com si fossin fitxers. Es poden definir llistes pròpies "
-"de paquets, utilitzar llistes predefinides, utilitzar tasques de /"
-"{tasksel}/, o una combinació d'aquests tres mètodes. Finalment, una sèrie "
-"d'opcions donen un cert control sobre /{apt}/ o si es prefereix /"
-"{aptitude}/, quan s'instaŀlen els paquets durant la construcció. Això pot "
-"ser útil si s'utilitza un proxy, es vol desactivar la instaŀlació de paquets "
-"recomanats per estalviar espai, o hi ha la necessitat de controlar quines "
-"versions dels paquets s'instaŀlen mitjançant la tècnica pinning d'APT, per "
-"nomenar algunes possibilitats."
+"paquets directament com si fossin fitxers. Es poden definir llistes de "
+"paquets, incloent-hi els metapaquets que instaŀlaran diversos paquets "
+"relacionats alhora, com ara paquets per a un ordinador d'escriptori o un "
+"llenguatge en particular. Finalment, una sèrie d'opcions donen un cert "
+"control sobre /{apt}/ o si es prefereix /{aptitude}/, quan s'instaŀlen els "
+"paquets durant la construcció. Això pot ser útil si s'utilitza un proxy, es "
+"vol desactivar la instaŀlació de paquets recomanats per estalviar espai, o "
+"hi ha la necessitat de controlar quines versions dels paquets s'instaŀlen "
+"mitjançant la tècnica pinning d'APT, per nomenar algunes possibilitats."
#. type: Plain text
#: en/user_customization-packages.ssi:8
@@ -238,10 +240,10 @@ 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 ""
+msgstr " $ lb config --distribution sid\n"
#. type: Plain text
#: en/user_customization-packages.ssi:20
@@ -261,7 +263,7 @@ msgstr ""
#: en/user_customization-packages.ssi:24
#, no-wrap
msgid " $ lb config --archive-areas \"main contrib\"\n"
-msgstr ""
+msgstr " $ lb config --archive-areas \"main contrib\"\n"
#. type: Plain text
#: en/user_customization-packages.ssi:28
@@ -348,6 +350,9 @@ msgid ""
" --mirror-chroot-security http://localhost/debian-security/ \\\n"
"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
#. type: Plain text
#: en/user_customization-packages.ssi:48
@@ -392,6 +397,8 @@ msgid ""
" $ lb config --mirror-binary http://mirror/debian/ \\\n"
" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
#. type: Plain text
#: en/user_customization-packages.ssi:61
@@ -434,7 +441,7 @@ msgstr ""
#: en/user_customization-packages.ssi:69
#, no-wrap
msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
-msgstr ""
+msgstr " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
#. type: Plain text
#: en/user_customization-packages.ssi:73
@@ -468,10 +475,10 @@ msgid "*{Note:}* some preconfigured package repositories are available for easy
msgstr "*{Nota:}* alguns repositoris preconfigurats de paquets estan disponibles per facilitar la selecció a través de l'opció #{--archives}#, per exemple, per habilitar instantànies en viu, una ordre simple és suficient per activar-ho:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
-msgstr ""
+msgstr " $ lb config --archives live.debian.net\n"
#. type: Plain text
#: en/user_customization-packages.ssi:87
@@ -483,19 +490,20 @@ msgstr "2~choosing-packages-to-install Selecció dels paquets a instaŀlar"
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"individual packages to install in a package list. You can also choose "
-"predefined lists of packages, or use APT tasks. And finally, you may place "
-"package files in your #{config/}# tree, which is well suited to testing of "
-"new or experimental packages before they are available from a repository."
+"individual packages to install in a package list. You can also use "
+"metapackages in those lists, or select them using package control file "
+"fields. And finally, you may place package files in your #{config/}# tree, "
+"which is well suited to testing of new or experimental packages before they "
+"are available from a repository."
msgstr ""
"Hi ha una sèrie de formes de triar els paquets que live-build instaŀlarà en "
"la imatge, que abasta una varietat de necessitats diferents. Es pot "
"simplement anomenar paquets individualment per instaŀlar en una llista de "
-"paquets. També es pot optar per llistes predefinides de paquets, o utilitzar "
-"les tasques d'APT. I, finalment, es poden coŀlocar paquets com si fossin "
-"fitxers dins del arbre #{config/}#, que és un mètode que s'adapta "
-"perfectament a fer proves amb paquets nous o experimentals abans de "
-"afegirlos a un repositori."
+"paquets. També es pot optar per utilitzar metapaquets a les llistes, o "
+"seleccionar-los utilitzant camps de control de fitxers de paquets. I, "
+"finalment, es poden copiar paquets com si fossin fitxers dins del arbre #"
+"{config/}#, que és un mètode que s'adapta perfectament a fer proves amb "
+"paquets nous o experimentals abans de afegirlos a un repositori."
#. type: Plain text
#: en/user_customization-packages.ssi:91
@@ -508,21 +516,15 @@ msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
"which makes it easy to build lists from other lists and adapt them for use "
-"in multiple configurations. You can use predefined package lists, providing "
-"in a modular fashion package selections from each of the major desktop "
-"environments and some special purpose lists, as well as standard lists the "
-"others are based upon. You can also provide your own package lists, or use a "
-"combination of both."
+"in multiple configurations. Package names may also be injected into the list "
+"using shell helpers at build time."
msgstr ""
"Les llistes de paquets són una forma eficaç d'expressar quins paquets han de "
"ser instaŀlats. La sintaxi de la llista suporta els fitxers inclosos i "
"seccions condicionals que fa que sigui fàcil de construir llistes a partir "
-"d'altres llistes i adaptar-ler per al propi ús en múltiples configuracions. "
-"Es poden utilitzar llistes predefinides de paquets, proporcionant una "
-"selecció de paquets de forma modular de cada un dels principals entorns "
-"d'escriptori i algunes llistes per a fins especials, així com llistes "
-"estàndard a partir de les que es basen altres. També es pot proporcionar "
-"llistes pròpies de paquets, o utilitzar una combinació d'ambdós."
+"d'altres llistes i adaptar-les per al propi ús en múltiples configuracions. "
+"Els noms dels paquets també poden ser injectats a la llista amb els ajudants "
+"de shell en temps de construcció. "
#. type: Plain text
#: en/user_customization-packages.ssi:95
@@ -532,53 +534,119 @@ msgstr "*{Nota:}* El comportament de live-build a l'hora d'especificar un paquet
#. type: Plain text
#: en/user_customization-packages.ssi:97
-msgid "3~ Predefined package lists"
-msgstr "3~ Llistes predefinides de paquets"
+#, fuzzy
+#| msgid "3~ Using metapackages"
+msgid "3~using-metapackages Using metapackages"
+msgstr "3~ Ús dels metapaquets"
#. type: Plain text
#: en/user_customization-packages.ssi:99
msgid ""
-"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--package-lists}# option. For example:"
+"The simplest way to populate your package list is to use a task metapackage "
+"maintained by your distribution. For example:"
msgstr ""
-"La forma més senzilla d'utilitzar les llistes consisteix a especificar una o "
-"més llistes predefinides amb l'opció #{--package-lists}#. Per exemple:"
+"La forma més senzilla per omplir la llista de paquets és utilitzar una tasca "
+"metapaquet mantinguda per una distribució. Per exemple:"
#. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:104
#, no-wrap
-msgid " $ lb config --package-lists \"gnome rescue\"\n"
+msgid ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
+msgstr ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:108
+msgid ""
+"This supercedes the older predefined list method supported in #{live-build}# "
+"2.x. Unlike predefined lists, task metapackages are not specific to the "
+"Debian Live project. Instead, they are maintained by specialist working "
+"groups within the distribution and therefore reflect the consensus of each "
+"group about which packages best serve the needs of the intended users. They "
+"also cover a much broader range of use cases than the predefined lists they "
+"replace."
+msgstr ""
+"Això reemplaça l'antic mètode de llistes predefinides de #{live-build}# 2.x. "
+"A diferència de les llistes predefinides, els metapaquets no són específics "
+"del projecte Debian Live. Per contra, són mantingudes per grups "
+"d'especialistes que treballen dins la distribució i per tant, reflecteixen "
+"el consens de cada grup sobre els paquets que serviran millor a les "
+"necessitats dels usuaris. A més, abasten una gamma molt més àmplia de casos "
+"d'ús que les llistes predefinides que substitueixen."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:110
+msgid ""
+"All task metapackages are prefixed #{task-}#, so a quick way to determine "
+"which are available (though it may contain a handful of false hits that "
+"match the name but aren't metapackages) is to match on the package name with:"
msgstr ""
+"Tots els metapaquets tenen el prefix #{task-}#, de manera que una forma "
+"ràpida de determinar quins estan disponibles (encara que pot contenir un "
+"grapat d'entrades falses que coincideixin amb el nom, però que no són "
+"metapaquets) és fer coincidir el nom del paquet amb:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:114
+#, no-wrap
+msgid " $ apt-cache search --names-only ^task-\n"
+msgstr " $ apt-cache search --names-only ^task-\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:118
msgid ""
-"The default location for the list files on your system is #{/usr/share/live/"
-"build/package-lists/}#. To determine the packages in a given list, read the "
-"corresponding file, paying attention to included files and conditionals as "
-"described in the following sections."
+"In addition to these, you will find other metapackages with various "
+"purposes. Some are subsets of broader task packages, like #{gnome-core}#, "
+"while others are individual specialized parts of a Debian Pure Blend, such "
+"as the #{education-*}# metapackages. To list all metapackages in the "
+"archive, install the #{debtags}# package and list all packages with the #"
+"{role::metapackage}# tag as follows:"
msgstr ""
-"La ubicació per defecte de les llistes en el sistema és #{/usr/share/live/"
-"build/package-lists/}#. Per determinar els paquets en una llista donada, "
-"llegir el fitxer corresponent, prestant atenció als fitxers inclosos i els "
-"condicionals com es descriu a les següents seccions."
+"A més d'aquests, es troben altres metapaquets amb diverses finalitats. "
+"Alguns són subconjunts de paquets de tasques més àmplies, com #{gnome-core}"
+"#, mentre que altres són parts individuals especialitzades de un Debian Pure "
+"Blend, com els metapaquets #{education-*}#. Per a una llista de tots els "
+"metapaquets a l'arxiu, instaŀlar el paquet #{debtags}# i llistar tots els "
+"paquets amb l'etiqueta #{role::metapackage}# de la següent manera:"
#. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:122
+#, no-wrap
+msgid " $ debtags search role::metapackage\n"
+msgstr " $ debtags search role::metapackage\n"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr "3~ Llistes locals de paquets"
#. type: Plain text
-#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:128
msgid ""
-"You may supplement the predefined lists using local package lists stored in #"
-"{config/package-lists/}#."
+"Whether you list metapackages, individual packages, or a combination of "
+"both, all local package lists are stored in #{config/package-lists/}#. Since "
+"more than one list can be used, this lends itself well to modular designs. "
+"For example, you may decide to devote one list to a particular choice of "
+"desktop, another to a collection of related packages that might as easily be "
+"used on top of a different desktop. This allows you to experiment with "
+"different combinations of sets of packages with a minimum of fuss, sharing "
+"common lists between different live image projects."
msgstr ""
-"Es poden completar les llistes predefinides mitjançant les llistes locals de "
-"paquets emmagatzemades a #{config/package-lists/}#."
+"Ja sigui afegint metapaquets a una llista, paquets individuals, o una "
+"combinació d'ambdós, totes les llistes de paquets locals s'emmagatzemen a #"
+"{config/package-lists/}#. Ja que es pot utilitzar més d'una llista, això es "
+"presta molt bé als dissenys modulars. Per exemple, es pot decidir dedicar "
+"una llista a una elecció particular d'escriptori, l'altra a una coŀlecció de "
+"paquets relacionats que puguin ser fàcilment utilitzats al damunt d'un "
+"escriptori diferent. Això permet experimentar amb diferents combinacions de "
+"conjunts de paquets amb un mínim d'esforç, intercanviant llistes comunes "
+"entre els diferents projectes d'imatges en viu."
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -590,18 +658,18 @@ msgstr ""
"llista."
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:132
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr "*{Nota:}* Si no s'especifica el sufix d'etapa, la llista s'utilitzarà per a ambdues etapes. Normalment, s'especifica #{.list.chroot}# de manera que els paquets només s'instaŀlaran al sistema de fitxers en viu i no hi haura una còpia extra del #{.deb}# en els medis.\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:134
msgid "3~ Local binary package lists"
msgstr "3~ Llistes locals de paquets per l'etapa binary"
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:136
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -619,48 +687,59 @@ msgstr ""
"list}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "3~ Extending a provided package list using includes"
-msgstr "3~ Ampliació d'una llista mitjançant includes"
+#: en/user_customization-packages.ssi:138
+msgid "3~generated-package-lists Generated package lists"
+msgstr "3~generated-package-lists Generar llistes de paquets"
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:140
msgid ""
-"The package lists that are included with live-build make extensive use of "
-"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
-"directory, as they serve as good examples of how to write your own 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 "
+"command to be executed within the chroot when the image is built. For "
+"example, one might include the line #{! grep-aptavail -n -sPackage -"
+"FPriority standard | sort}# in a package list to produce a sorted list of "
+"available packages with #{Priority: standard}#."
msgstr ""
-"Les llistes de paquets que s'inclouen amb live-build fan un ús extensiu dels "
-"includes. Es poden consultar al directori #{/usr/share/live/build/package-"
-"lists/}# ja que serveixen com a bons exemples de com escriure llistes "
-"pròpies."
+"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 produir una llista "
+"ordenada de paquets disponibles amb #{Priority: standard}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:142
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list "
-"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
-"following contents:"
+"In fact, selecting packages with the #{grep-aptavail}# command (from the #"
+"{dctrl-tools}# package) is so useful that #{live-build}# provides a #"
+"{Packages}# helper script as a convenience. This script takes two arguments: "
+"#{field}# and #{pattern}#. Thus, you can create a list with the following "
+"contents:"
msgstr ""
-"Per exemple, per fer una llista que inclogui la llista predefinida #{gnome}# "
-"més /{iceweasel}/, crear #{config/package-lists/my.list.chroot}# amb el "
-"contingut:"
+"De fet, la selecció de paquets amb l'ordre #{grep-aptavail}# (del paquet #"
+"{dctrl-tools}#) és tan útil que #{live-build}# proporciona un script #"
+"{Packages}# d'ajuda per motius de comoditat. Aquest script accepta dos "
+"arguments: #{field}# and #{pattern}#. Per tant, pot crear una llista amb els "
+"següents continguts:"
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
-" #include <gnome>\n"
-" iceweasel\n"
+" $ lb config\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
msgstr ""
+" $ lb config\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr "3~ Ús de condicionals dins de les llistes de paquets"
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -678,7 +757,7 @@ msgstr ""
"{ARCHIVE_AREAS}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
@@ -687,16 +766,19 @@ msgstr ""
"amd64}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
" ia32-libs\n"
" #endif\n"
msgstr ""
+" #if ARCHITECTURES amd64\n"
+" ia32-libs\n"
+" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:165
msgid ""
"You may test for any one of a number of values, e.g. to install /"
"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
@@ -707,16 +789,19 @@ msgstr ""
"architectures amd64}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURES i386 amd64\n"
" memtest86+\n"
" #endif\n"
msgstr ""
+" #if ARCHITECTURES i386 amd64\n"
+" memtest86+\n"
+" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:175
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
@@ -727,85 +812,46 @@ msgstr ""
"a través de l'opció #{--archive-areas}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
" vrms\n"
" #endif\n"
msgstr ""
+" #if ARCHIVE_AREAS contrib non-free\n"
+" vrms\n"
+" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr "Un condicional pot envoltar una directiva #{#include}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
" #include <gnome-full>\n"
" #endif\n"
msgstr ""
+" #if ARCHITECTURES amd64\n"
+" #include <gnome-full>\n"
+" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr "No és possible el anidament dels condicionals."
#. type: Plain text
-#: en/user_customization-packages.ssi:180
-msgid "3~ Tasks"
-msgstr "3~ Tasques"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid ""
-"The Debian Installer offers the user choices of a number of preselected "
-"lists of packages, each one focused on a particular kind of system, or task "
-"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
-"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
-"by APT through the \"Task:\" field. You can specify one or more tasks in "
-"live-build by putting them in a list in #{config/task-lists/}#, as in the "
-"example below."
-msgstr ""
-"L'instaŀlador de Debian ofereix al usuari opcions d'una sèrie de llistes de "
-"paquets preseleccionats, cadascuna centrada en un tipus particular de "
-"sistema, o una tasca per a la qual es pot utilitzar un sistema, com "
-"\"Graphical desktop environment\", \"Mail server\" o \"Laptop\". Aquestes "
-"llistes es diuen \"tasks\" (tasques) i son suportades per APT a través de "
-"l'opció \"Task:\" es poden especificar una o més tasques a live-build posant-"
-"les en una llista a #{config/task-lists/}#, com en l'exemple següent."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:187
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:191
-msgid ""
-"The primary tasks available in the Debian Installer can be listed with #"
-"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including the ones not included in this list, may be examined with #{tasksel "
-"--task-packages}#."
-msgstr ""
-"Es poden llistar les principals tasques disponibles al instaŀlador de Debian "
-"amb #{tasksel --list-tasks}# al sistema viu. El contingut de qualsevol "
-"tasca, fins i tot les no estan incloses en aquesta llista, poden ser "
-"examinades amb #{tasksel --task-packages}#."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:197
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr "3~desktop-and-language-tasks Tasques d'escriptori i llenguatge"
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:199
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -830,7 +876,7 @@ msgstr ""
"llengües corresponents."
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:201
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -848,13 +894,20 @@ msgstr ""
"comportament de live-build per defecte."
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:203
+#, fuzzy
+#| msgid ""
+#| "Because there is no provision made automatically for language tasks, "
+#| "which include such things as language-specific fonts and input-method "
+#| "packages, if you want them, you need to specify them in your "
+#| "configuration. For example, a GNOME desktop image containing support for "
+#| "Japanese might include these tasks:"
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
"you want them, you need to specify them in your configuration. For example, "
"a GNOME desktop image containing support for Japanese might include these "
-"tasks:"
+"task metapackages:"
msgstr ""
"Com que no hi ha cap ajust automàtic per les tasques de llengua que "
"incloguin coses com ara fonts específiques per a una llengua o paquets de "
@@ -863,47 +916,23 @@ msgstr ""
"podrie incloure les següents tasques:"
#. type: Plain text
-#: en/user_customization-packages.ssi:205
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
-" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:209
-msgid ""
-"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value, if it differs from the "
-"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
-"variable or else tasksel will not recognize and install it. Thus:"
-msgstr ""
-"Com les tasques d'escriptori són \"internes\" per a cada tasca d'escriptori "
-"inclosa en la imatge, el valor corresponent, si aquest és diferent del valor "
-"per defecte, \"gnome\", s'ha de fer servir la variable de preconfiguració "
-"\"tasksel/desktop\" o en cas contrari tasksel no la reconeixerà i no la "
-"instaŀlarà. Així:"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:214
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ lb config\n"
+#| " $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+#| " $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
msgid ""
" $ lb config\n"
-" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
+" $ echo \"task-gnome-desktop task-laptop\" >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-japanese task-japanese-desktop task-japanese-gnome-desktop\" >> config/package-lists/my.list.chroot\n"
msgstr ""
+" $ lb config\n"
+" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:218
-msgid ""
-"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
-"\"."
-msgstr ""
-"Aquest paràmetre pot tenir diversos valors, per exemple \"lxde xfce\" en "
-"lloc de \"kde\"."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:213
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
@@ -912,7 +941,7 @@ msgstr ""
"modificats o de tercers"
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:215
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -930,7 +959,7 @@ msgstr ""
"funcionalitat personalitzada i/o propietària."
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:217
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -947,22 +976,22 @@ msgstr ""
"guide/ i en altres llocs."
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:219
msgid "There are two ways of installing modified custom packages:"
msgstr "Hi ha dues formes d'instaŀlar paquets personalitzats modificats:"
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:221
msgid "_* #{packages.chroot}#"
-msgstr ""
+msgstr "_* #{packages.chroot}#"
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:223
msgid "_* Using a custom APT repository"
msgstr "_* L'ús d'un repositori APT personalitzat"
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:225
msgid ""
"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
"customizations but has a number of drawbacks, whilst using a custom APT "
@@ -974,12 +1003,12 @@ msgstr ""
"temps necessari."
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:227
msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr "3~ Fer servir #{packages.chroot}# per instaŀar paquets personalitzats"
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:229
msgid ""
"To install a custom package, simply copy it to the #{config/packages.chroot/}"
"# directory. Packages that are inside this directory will be automatically "
@@ -992,7 +1021,7 @@ msgstr ""
"construcció - no cal especificar res més en cap altre lloc."
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:231
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
@@ -1001,7 +1030,7 @@ msgstr ""
"de fer això és utilitzar #{dpkg-name}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:233
msgid ""
"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
@@ -1010,12 +1039,12 @@ msgstr ""
"té els seus desavantatges:"
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:235
msgid "_* It is not possible to use secure APT."
msgstr "_* No és possible utilitzar APT segur."
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:237
msgid ""
"_* You must install all appropriate packages in the #{config/packages."
"chroot/}# directory."
@@ -1024,7 +1053,7 @@ msgstr ""
"chroot/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:239
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
@@ -1033,12 +1062,12 @@ msgstr ""
"el control de revisió."
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:241
msgid "3~ Using an APT repository to install custom packages"
msgstr "3~ Fer servir un repositori APT per instaŀlar paquets personalitzats"
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:243
msgid ""
"Unlike using #{packages.chroot}#, when using a custom APT repository you "
"must ensure that you specify the packages elsewhere. See {Choosing packages "
@@ -1050,7 +1079,7 @@ msgstr ""
"per més detalls."
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:245
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -1062,12 +1091,12 @@ msgstr ""
"modificats."
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:247
msgid "3~ Custom packages and APT"
msgstr "3~ Paquets personalitzats i APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:249
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -1082,7 +1111,7 @@ msgstr ""
"versió, APT triarà per instaŀlar el paquet amb la versió més alta."
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:251
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -1098,12 +1127,12 @@ msgstr ""
"per més informació."
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:253
msgid "2~ Configuring APT at build time"
msgstr "2~ Configurar APT en temps de construcció"
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:255
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -1120,12 +1149,12 @@ msgstr ""
"opcions que comencen amb #{apt}# a la pàgina del manual de #{lb_config}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:257
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr "3~choosing-apt-or-aptitude Seleccionar apt o aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:259
msgid ""
"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -1140,7 +1169,7 @@ msgstr ""
"notable és la forma en que es manegen els paquets que falten."
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:261
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
@@ -1149,7 +1178,7 @@ msgstr ""
"l'instaŀlació de paquets fallarà. Aquesta és la configuració per defecte."
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:263
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
@@ -1158,12 +1187,12 @@ msgstr ""
"l'instaŀlació de paquets tindrà èxit."
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:265
msgid "3~ Using a proxy with APT"
msgstr "3~ L'ús d'un proxy amb APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:267
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -1174,18 +1203,20 @@ msgstr ""
"apt-ftp-proxy}# o #{--apt-http-proxy}# segons sigui necessari, per exemple,"
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:271
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
-msgstr ""
+msgstr " $ lb config --apt-http-proxy http://proxy/\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:282
-msgid "3~ Tweaking APT to save space"
+#: en/user_customization-packages.ssi:275
+#, fuzzy
+#| msgid "3~ Tweaking APT to save space"
+msgid "3~tweaking-apt-to-save-space Tweaking APT to save space"
msgstr "3~ Afinar APT per estalviar espai"
#. type: Plain text
-#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:277
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -1195,7 +1226,7 @@ msgstr ""
"aquest cas una o altra o ambdós de les següentes opcions poden ser d'interès."
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:279
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
@@ -1203,13 +1234,13 @@ msgstr ""
"Si no es vol incloure els índexs d'APT en la imatge, es poden omitir amb:"
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:283
#, no-wrap
msgid " $ lb config --apt-indices false\n"
-msgstr ""
+msgstr " $ lb config --apt-indices false\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:287
msgid ""
"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
@@ -1225,34 +1256,66 @@ msgstr ""
"aquests índexs."
#. type: Plain text
-#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:289
+#, fuzzy
+#| msgid ""
+#| "If you find the installation of recommended packages bloats your image "
+#| "too much, you may disable that default option of APT with:"
msgid ""
"If you find the installation of recommended packages bloats your image too "
-"much, you may disable that default option of APT with:"
+"much, provided you are prepared to deal with the consequences discussed "
+"below, you may disable that default option of APT with:"
msgstr ""
"Si es considera que la instaŀlació de tots els paquets recomanats infla "
"massa la imatge, es pot desactivar aquesta opció per defecte d'APT amb:"
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:293
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:304
-msgid ""
-"The tradeoff here is that if you don't install recommended packages for a "
-"given package, that is, \"packages that would be found together with this "
-"one in all but unusual installations\" (Debian Policy Manual, section 7.2), "
-"some packages that you actually need may be omitted. Therefore, we suggest "
-"you review the difference turning off recommends makes to your packages list "
-"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
-"in your list any missing packages that you still want installed. "
-"Alternatively, if you find you only want a small number of recommended "
-"packages left out, leave recommends enabled and set a negative APT pin "
-"priority on selected packages to prevent them from being installed, as "
-"explained in {APT pinning}#apt-pinning."
+msgstr " $ lb config --apt-recommends false\n"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:297
+msgid ""
+"The most important consequence of turning off recommends is that #{live-boot}"
+"# and #{live-config}# themselves recommend some packages that provide "
+"important functionality used by most Live configurations, such as #{user-"
+"setup}# which #{live-config}# recommends and is used to create the live "
+"user. In all but the most exceptional circumstances you need to add back at "
+"least some of these recommends to your package lists or else your image will "
+"not work as expected, if at all. Look at the recommended packages for each "
+"of the #{live-*}# packages included in your build and if you are not certain "
+"you can omit them, add them back into your package lists."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:299
+#, fuzzy
+#| msgid ""
+#| "The tradeoff here is that if you don't install recommended packages for a "
+#| "given package, that is, \"packages that would be found together with this "
+#| "one in all but unusual installations\" (Debian Policy Manual, section "
+#| "7.2), some packages that you actually need may be omitted. Therefore, we "
+#| "suggest you review the difference turning off recommends makes to your "
+#| "packages list (see the #{binary.packages}# file generated by #{lb build}"
+#| "#) and re-include in your list any missing packages that you still want "
+#| "installed. Alternatively, if you find you only want a small number of "
+#| "recommended packages left out, leave recommends enabled and set a "
+#| "negative APT pin priority on selected packages to prevent them from being "
+#| "installed, as explained in {APT pinning}#apt-pinning."
+msgid ""
+"The more general consequence is that if you don't install recommended "
+"packages for any given package, that is, \"packages that would be found "
+"together with this one in all but unusual installations\" (Debian Policy "
+"Manual, section 7.2), some packages that users of your Live system actually "
+"need may be omitted. Therefore, we suggest you review the difference turning "
+"off recommends makes to your packages list (see the #{binary.packages}# file "
+"generated by #{lb build}#) and re-include in your list any missing packages "
+"that you still want installed. Alternatively, if you find you only want a "
+"small number of recommended packages left out, leave recommends enabled and "
+"set a negative APT pin priority on selected packages to prevent them from "
+"being installed, as explained in {APT pinning}#apt-pinning."
msgstr ""
"El desavantatge aquí és que si no s'instaŀlen els paquets recomanats per un "
"paquet determinat, és a dir, \"els paquets que es troben junts amb aquest en "
@@ -1268,12 +1331,12 @@ msgstr ""
"{APT pinning}#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:301
msgid "3~ Passing options to apt or aptitude"
msgstr "3~ Passar opcions per a apt o aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:303
msgid ""
"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1286,12 +1349,12 @@ msgstr ""
"pàgines del manual de #{apt}# i #{aptitude}# per a més detalls."
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:305
msgid "3~apt-pinning APT pinning"
msgstr "3~apt-pinning APT pinning"
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:307
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1304,7 +1367,7 @@ msgstr ""
"aquest últim cas, crear #{config/includes.chroot/etc/apt/preferences}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:309
msgid ""
"Let's say you are building a wheezy live system but need all the live "
"packages that end up in the binary image to be installed from sid at build "
@@ -1321,7 +1384,7 @@ msgstr ""
"wheezy. El que segueix aconseguira això:"
#. type: Plain text
-#: en/user_customization-packages.ssi:322
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
@@ -1330,9 +1393,14 @@ msgid ""
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << END\n"
+" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 600\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" Package: *\n"
@@ -1340,44 +1408,53 @@ msgid ""
" Pin-Priority: 1\n"
" END\n"
msgstr ""
+" Package: *\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 1\n"
+" END\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:326
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
msgstr "*{Nota:}* Es poden usar comodins en els noms dels paquets (per exemple, *{Package: live-*}*) amb la versió 0.8.14 o superior d'Apt. Això significa que funciona amb wheezy utilitzant:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:330
msgid "$ lb config --distribution wheezy"
-msgstr ""
+msgstr "$ lb config --distribution wheezy"
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:334
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
-"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
-"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
-"{gnome-keyring}/ package. This can be done by adding the following stanza to "
-"#{config/chroot_apt/preferences}#:"
+"package. Suppose you are building an LXDE image using #{task-lxde-desktop}# "
+"in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the "
+"user prompted to store wifi passwords in the keyring. This metapackage "
+"depends on /{lxde-core}/, which recommends /{gksu}/, which in turn "
+"recommends /{gnome-keyring}/. So you want to omit the recommended /{gnome-"
+"keyring}/ package. This can be done by adding the following stanza to #"
+"{config/chroot_apt/preferences}#:"
msgstr ""
"Una prioritat pin negativa evitarà que un paquet s'instaŀli, com en el cas "
"que no es vulgui un paquet que és recomanat per un altre paquet. Suposem que "
-"s'està construint una imatge LXDE amb #{--package-lists lxde}# però no es "
-"desitja que al usuari se li demani que guardi les contrasenyes wifi al "
-"clauer. Aquesta llista inclou /{gdm}/, que depèn de /{gksu}/, que al seu "
-"torn recomana /{gnome-keyring}/. Si es vol omitir el paquet recomanat /"
-"{gnome-keyring}/ això es pot fer mitjançant l'addició de les següents línies "
-"al #{config/chroot_apt/preferences}#:"
+"s'està construint una imatge LXDE afegint #{task-lxde-desktop}# a #{config/"
+"package-lists/lxde-desktop.list.chroot}# però no es desitja que al usuari se "
+"li demani que guardi les contrasenyes wifi al clauer. Aquesta llista depèn "
+"de /{lxde-core}/, que recomana /{gksu}/, que al seu torn recomana /{gnome-"
+"keyring}/. Si es vol omitir el paquet recomanat /{gnome-keyring}/ això es "
+"pot fer mitjançant l'addició de les següents línies al #{config/chroot_apt/"
+"preferences}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:345
+#: en/user_customization-packages.ssi:340
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
" Pin: version *\n"
" Pin-Priority: -1\n"
msgstr ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
diff --git a/manual/po/ca/user_customization-runtime.ssi.po b/manual/po/ca/user_customization-runtime.ssi.po
index 1ddeaec..1f83e15 100644
--- a/manual/po/ca/user_customization-runtime.ssi.po
+++ b/manual/po/ca/user_customization-runtime.ssi.po
@@ -5,15 +5,15 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
-"PO-Revision-Date: 2012-07-20 21:51+0200\n"
+"POT-Creation-Date: 2012-07-27 21:48+0300\n"
+"PO-Revision-Date: 2012-08-06 23:06+0100\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -158,12 +158,14 @@ msgstr "}code"
#. type: Plain text
#: en/user_customization-runtime.ssi:2
msgid ":B~ Customizing run time behaviours"
-msgstr ""
+msgstr ":B~ Personalització dels comportaments en temps d'execució"
#. type: Plain text
#: en/user_customization-runtime.ssi:4
msgid "1~customizing-run-time-behaviours Customizing run time behaviours"
msgstr ""
+"1~customizing-run-time-behaviours Personalització dels comportaments en "
+"temps d'execució"
#. type: Plain text
#: en/user_customization-runtime.ssi:6
@@ -173,11 +175,15 @@ msgid ""
"in. A full list of all possibilities can be found in the manpage of live-"
"config."
msgstr ""
+"Tota la configuració que es fa durant l'execució es feta per live-config. "
+"Aquestes són algunes de les opcions més comunes de live-config en que els "
+"usuaris estan interessats. Una llista completa de totes les possibilitats es "
+"poden trobar a la pàgina del manual de live-config."
#. type: Plain text
#: en/user_customization-runtime.ssi:8
msgid "2~ Customizing the live user"
-msgstr ""
+msgstr "2~ Personalitzar l'usuari en viu"
#. type: Plain text
#: en/user_customization-runtime.ssi:10
@@ -188,6 +194,12 @@ msgid ""
"discussed in {Live/chroot local includes}#live-chroot-local-includes, but "
"also any groups and permissions associated with the live user."
msgstr ""
+"Una consideració important és que l'usuari en viu es creat per live-boot "
+"durant l'arrencada i no per live-build en temps de construcció. Això "
+"influeix no només en on s'han de introduir els materials relacionats amb "
+"l'usuari durant la construcció, tal i com es va explicar a {Live/chroot "
+"local includes}#live-chroot-local-includes, sinó també en els grups i els "
+"permisos associats amb l'usuari."
#. type: Plain text
#: en/user_customization-runtime.ssi:12
@@ -197,6 +209,10 @@ msgid ""
"add the live user to the #{fuse}# group, add the following preseed under #"
"{config/preseed/}# for the chroot stage:"
msgstr ""
+"Es pot especificar grups addicionals als que pertanyerà l'usuari en viu fent "
+"una preconfiguració (preseed) prèvia del valor debconf #{passwd/user-default-"
+"groups}#. Per exemple, per afegir l'usuari en viu al grup #{fuse}#, afegir "
+"la següent configuració preseed a l'etapa chroot:"
#. type: Plain text
#: en/user_customization-runtime.ssi:19
@@ -207,6 +223,10 @@ msgid ""
" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
" >> config/preseed/my.preseed.chroot\n"
msgstr ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+" >> config/preseed/my.preseed.chroot\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:23
@@ -215,18 +235,23 @@ msgid ""
"password \"live\". If you want to do that for any reason, you can easily "
"achieve it as follows:"
msgstr ""
+"També és possible canviar el nom d'usuari per defecte \"user\" i la "
+"contrasenya per defecte \"live\". Si es vol fer això per alguna raó, es pot "
+"aconseguir fàcilment de la següent manera:"
#. type: Plain text
#: en/user_customization-runtime.ssi:25
msgid ""
"To change the default username you can simply specify it in your config:"
msgstr ""
+"Per canviar el nom d'usuari per defecte només s'ha d'especificar en la "
+"configuració:"
#. type: Plain text
#: en/user_customization-runtime.ssi:29
#, no-wrap
msgid " $ lb config --bootappend-live \"username=live-user\"\n"
-msgstr ""
+msgstr " $ lb config --bootappend-live \"username=live-user\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:33
@@ -237,26 +262,34 @@ msgid ""
"prefix it accordingly (e.g. 2000-passwd) and add it to #{config/includes."
"chroot/lib/live/config/}#"
msgstr ""
+"Una forma possible de canviar la contrasenya per defecte és per mitjà d'un "
+"ganxo com s'explica a {Scripts ganxo durant l'arrencada}#boot-time-hooks. "
+"Per fer això, es pot utilitzar el script ganxo \"passwd\" de #{/usr/share/"
+"doc/live-config/examples/hooks}#, posar-li un prefix adequat (per exemple "
+"2000-passwd) i afegir-lo a #{config/includes.chroot/lib/live/config/}#"
#. type: Plain text
#: en/user_customization-runtime.ssi:35
msgid "2~customizing-locale-and-language Customizing locale and language"
msgstr ""
+"2~customizing-locale-and-language Personalització de l'entorn local i el "
+"llenguatge"
#. type: Plain text
#: en/user_customization-runtime.ssi:37
msgid "When the live system boots, language is involved in two steps:"
msgstr ""
+"Quan el sistema en viu arrenca, el llenguatge està implicat en dos passos:"
#. type: Plain text
#: en/user_customization-runtime.ssi:39
msgid "_* the locale generation"
-msgstr ""
+msgstr "_* la generació de locales"
#. type: Plain text
#: en/user_customization-runtime.ssi:41
msgid "_* setting the keyboard configuration"
-msgstr ""
+msgstr "_* establir la configuració del teclat"
#. type: Plain text
#: en/user_customization-runtime.ssi:43
@@ -265,17 +298,22 @@ msgid ""
"To define the locale that should be generated, use the #{locales}# parameter "
"in the #{--bootappend-live}# option of #{lb config}#, e.g."
msgstr ""
+"L'entorn local per omissió en la construcció d'un sistema viu és #"
+"{locales=en_US.UTF-8}#. Per definir la configuració regional que s'ha de "
+"generar, utilitzar el paràmetre #{locales}# de la opció #{--bootappend-live}"
+"# de #{lb config}#, per exemple. "
#. type: Plain text
#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
-msgstr ""
+msgstr " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:51
msgid "Multiple locales may be specified as a comma-delimited list."
msgstr ""
+"Es poden especificar diverses locales en una llista separada per comes."
#. type: Plain text
#: en/user_customization-runtime.ssi:53
@@ -286,18 +324,33 @@ msgid ""
"full #{language_country.encoding}# word. A list of supported locales and the "
"encoding for each can be found in #{/usr/share/i18n/SUPPORTED}#."
msgstr ""
+"Aquest paràmetre, així com els paràmetres de configuració del teclat que "
+"s'indican a continuació, també es pot utilitzar en la línia d'ordres del "
+"nucli. Es pot especificar una configuració regional mitjançant #"
+"{language_country}# (en aquest cas s'utilitza la codificació per defecte) o "
+"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}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:55
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 "
+"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:"
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-"
+"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:"
#. type: Plain text
#: en/user_customization-runtime.ssi:68
@@ -314,6 +367,16 @@ msgid ""
" de_mac ch: German (Switzerland, Macintosh)\n"
" ! option\n"
msgstr ""
+"$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst\n"
+" ! model\n"
+" ! layout\n"
+" ch German (Switzerland)\n"
+" ! variant\n"
+" legacy ch: German (Switzerland, legacy)\n"
+" de_nodeadkeys ch: German (Switzerland, eliminate dead keys)\n"
+" de_sundeadkeys ch: German (Switzerland, Sun dead keys)\n"
+" de_mac ch: German (Switzerland, Macintosh)\n"
+" ! option\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:72
@@ -321,6 +384,8 @@ msgid ""
"Note that each variant lists the layout to which it applies in the "
"description."
msgstr ""
+"Tinir en compte que cada variant mostra la distribució que s'aplica en la "
+"descripció."
#. type: Plain text
#: en/user_customization-runtime.ssi:74
@@ -328,12 +393,15 @@ msgid ""
"Often, only the layout needs to be configured. For example, to get the "
"locale files for German and Swiss German keyboard layout in X use:"
msgstr ""
+"Sovint, només la distribució necessita ser configurada. Per exemple, per "
+"obtenir els fitxers de configuració regional per a la distribució del teclat "
+"alemany i suís-alemany per l'entorn gràfic X:"
#. type: Plain text
#: en/user_customization-runtime.ssi:78
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
-msgstr ""
+msgstr " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:82
@@ -342,14 +410,20 @@ msgid ""
"parameters. For example, to set up a French system with a French-Dvorak "
"layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:"
msgstr ""
+"No obstant això, per als casos d'ús molt específics, potser es vol incloure "
+"altres paràmetres. Per exemple, per establir un sistema francès, amb un una "
+"distribució de teclat French-Dvorak (anomenat Bepo) en un teclat USB "
+"TypeMatrix EZ-Reach 2030, utilitzar:"
#. type: Plain text
#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
" $ 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"
msgstr ""
+" $ lb config --bootappend-live \\\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
@@ -358,24 +432,35 @@ msgid ""
"{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:"
-msgstr ""
+"# 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:"
+msgstr ""
+"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:"
#. type: Plain text
#: en/user_customization-runtime.ssi:96
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
msgstr ""
+" $ lb config --bootappend-live \\\n"
+" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:100
msgid "2~persistence Persistence"
-msgstr ""
+msgstr "2~persistence Persistència"
#. type: Plain text
#: en/user_customization-runtime.ssi:102
@@ -384,6 +469,9 @@ msgid ""
"media, like a cdrom, where writes and modifications do not survive reboots "
"of the host hardware which runs it."
msgstr ""
+"Un paradigma d'un live cd és ser un sistema pre-instaŀlat, que arrenca desde "
+"medis de només lectura, com un cdrom, on les modificacions no sobreviuen als "
+"reinicis del maquinari que l'executa."
#. type: Plain text
#: en/user_customization-runtime.ssi:104
@@ -393,6 +481,10 @@ msgid ""
"should be considered read-only and all the run-time evolutions of the system "
"are lost at shutdown."
msgstr ""
+"Un sistema Debian Live és una generalització d'aquest paradigma i per tant, "
+"compatible amb altres medis, a més dels CDs, però tot i així, en el seu "
+"comportament per defecte, s'ha de considerar de només lectura i totes les "
+"evolucions en temps d'execució del sistema es perden al apagar l'equip."
#. type: Plain text
#: en/user_customization-runtime.ssi:106
@@ -404,6 +496,13 @@ msgid ""
"directories are written on writable media, typically a ram disk (tmpfs) and "
"ram disks' data do not survive reboots."
msgstr ""
+"La \"Persistència\" és un nom comú per nomenar els diferents tipus de "
+"solucions per guardar després de reiniciar algunes, o totes, les dades "
+"d'aquesta evolució en temps d'execució del sistema. Per entendre com "
+"funciona, seria útil saber que, encara que el sistema s'inicia i s'executa "
+"des de medis de només lectura, les modificacions als fitxers i directoris "
+"s'escriuen ens medis d'escriptura, en general un ramdisk (tmpfs) i les dades "
+"dels discos ram no sobreviuen als reinicis."
#. type: Plain text
#: en/user_customization-runtime.ssi:108
@@ -414,6 +513,12 @@ msgid ""
"Live in different ways, and all but the last one require a special boot "
"parameter to be specified at boot time: #{persistence}#."
msgstr ""
+"Les dades emmagatzemades en aquest disc ram han de ser guardades en un "
+"suport d'escriptura persistent com medis d'emmagatzematge locals, un recurs "
+"compartit de xarxa o fins i tot una sessió d'una multisessió de un CD/DVD "
+"(re)grabable. Tots aquests medis són compatibles amb Debian Live de "
+"diferents maneres, i totes menys l'última d'elles requereixen un paràmetre "
+"d'arrencada especial que s'especifica en l'arrencada: #{persistence}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:110
@@ -424,16 +529,25 @@ msgid ""
"persistence volumes to use by specifying certain boot parameters described "
"in the live-boot(7) man page. A persistence volume is any of the following:"
msgstr ""
+"Si s'utilitza el paràmetre d'arrencada #{persistence}# (i no s'utilitza #"
+"{nopersistence}#) es proven els medis locals d'emmagatzematge (per exemple, "
+"discs durs, unitats USB) buscant volums amb persistència durant l'arrencada. "
+"És possible restringir els tipus de volums amb persistència que s'utilitzarà "
+"mitjançant l'especificació de certs paràmetres d'arrencada que es descriuen "
+"a la pàgina del manual de live-boot(7). Un volum amb persistència és "
+"qualsevol dels següents:"
#. type: Plain text
#: en/user_customization-runtime.ssi:112
msgid "_* a partition, identified by its GPT name."
-msgstr ""
+msgstr "_* una partició, identificada pel seu nom GPT."
#. type: Plain text
#: en/user_customization-runtime.ssi:114
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
+"_* un sistema de fitxers, identificat per la seva etiqueta de sistema de "
+"fitxers."
#. type: Plain text
#: en/user_customization-runtime.ssi:116
@@ -443,6 +557,11 @@ msgid ""
"the file name must also use the containing filesystem as the file extension, "
"e.g. \"persistence.ext4\"."
msgstr ""
+"_* un fitxer imatge situat en l'arrel de qualsevol sistema de fitxers "
+"llegibles (fins i tot una partició NTFS d'un altre SO), identificat pel seu "
+"nom de fitxer. En aquest cas el nom del fitxer ha d'utilitzar també el "
+"sistema de fitxers que conté com extensió del nom, per exemple, "
+"\"persistence.ext4\"."
#. type: Plain text
#: en/user_customization-runtime.ssi:118
@@ -452,6 +571,10 @@ msgid ""
"persistence.conf}#. See {The live-persistence.conf file}#live-persistence-"
"conf"
msgstr ""
+"L'etiqueta de volum per als overlays ha de ser #{persistence}#. I per tal de "
+"personalitzar completament la persistència del volum hi ha d'haver un arxiu "
+"anomenat #{live-persistence.conf}#. Veure {El fitxer live-persistence.conf}"
+"#live-persistence-conf"
#. type: Plain text
#: en/user_customization-runtime.ssi:120
@@ -460,17 +583,22 @@ msgid ""
"persistence. It can be, for instance, an ext4 partition on a hard disk or on "
"a usb key created with, e.g.:"
msgstr ""
+"Aquests són alguns exemples de com preparar un volum que s'utilitzarà per a "
+"la persistència. Pot ser, per exemple, una partició ext4 en un disc dur o en "
+"una clau USB creat amb, per exemple:"
#. type: Plain text
#: en/user_customization-runtime.ssi:124
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
-msgstr ""
+msgstr " # mkfs.ext4 -L persistence /dev/sdb1\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
+"Veure també {Utilitzar l'espai que queda en una memòria USB}#using-usb-extra-"
+"space."
#. type: Plain text
#: en/user_customization-runtime.ssi:130
@@ -478,12 +606,14 @@ msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
+"Si ja hi ha una partició al dispositiu, és pot canviar l'etiqueta amb un "
+"dels següents:"
#. type: Plain text
#: en/user_customization-runtime.ssi:134
#, no-wrap
msgid " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
-msgstr ""
+msgstr " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:138
@@ -491,6 +621,8 @@ msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
msgstr ""
+"Heus aquí un exemple de com crear un fitxer imatge basat en ext4 utilitzat "
+"per a la persistència:"
#. type: Plain text
#: en/user_customization-runtime.ssi:143
@@ -499,16 +631,20 @@ msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
" $ /sbin/mkfs.ext4 -F persistence\n"
msgstr ""
+" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext4 -F persistence\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:147
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
+"A continuació, copiar el fitxer #{persistence}# a l'arrel d'una partició "
+"d'escriptura."
#. type: Plain text
#: en/user_customization-runtime.ssi:149
msgid "3~live-persistence-conf The live-persistence.conf file"
-msgstr ""
+msgstr "3~live-persistence-conf El fitxer live-persistence.conf"
#. type: Plain text
#: en/user_customization-runtime.ssi:151
@@ -518,6 +654,10 @@ msgid ""
"volume's filesystem root, controls which directories it makes persistent, "
"and in which way."
msgstr ""
+"Un volum amb l'etiqueta #{persistence}# pot ser configurat per fer "
+"directoris arbitraris persistents. El fitxer #{live-persistence.conf}#, "
+"ubicat a l'arrel del sistema de fitxers del volum, controla els directoris "
+"que fa persistents, i de quina manera."
#. type: Plain text
#: en/user_customization-runtime.ssi:153
@@ -527,6 +667,11 @@ msgid ""
"for most uses. Let's say we want to make our home directory and APT cache "
"persistent in an ext4 filesystem on the /dev/sdb1 partition:"
msgstr ""
+"A la pàgina de manual de live-persistence.conf(5) s'explica en detall com es "
+"configuran els muntatges de les overlays, però un simple exemple hauria de "
+"ser suficient per la majoria d'usos. Si es vol fer el directori home i el "
+"directori del cache d'APT persistents en un sistema de fitxers ext4 a la "
+"partició /dev/sdb1:"
#. type: Plain text
#: en/user_customization-runtime.ssi:160
@@ -537,6 +682,10 @@ msgid ""
" # echo \"/home\" >> /mnt/live-persistence.conf\n"
" # echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
msgstr ""
+" # mkfs.ext4 -L persistence /dev/sdb1\n"
+" # mount -t ext4 /dev/sdb1 /mnt\n"
+" # echo \"/home\" >> /mnt/live-persistence.conf\n"
+" # echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:164
@@ -549,6 +698,14 @@ msgid ""
"neither #{/live}# (or any of its sub-directories) nor #{/}# can be made "
"persistent using custom mounts."
msgstr ""
+"Després es reinicia el sistema. Durant la primera arrencada el contingut de #"
+"{/home}# i #{/var/cache/apt}# es copiaran en el volum de la persistència, i "
+"d'aquí en endavant tots els canvis en aquests directoris es guardaran en el "
+"volum de la persistència. Tenir en compte que les rutes que apareixen en el "
+"fitxer #{live-persistence.conf}# no poden contenir espais en blanc o els "
+"components especials #{.}# i #{..}#. A més, ni #{/live}# (o qualsevol dels "
+"seus subdirectoris) ni #{/}# es poden fer persistents utilitzant muntatges "
+"personalitzats."
#. type: Plain text
#: en/user_customization-runtime.ssi:166
@@ -562,11 +719,21 @@ msgid ""
"persistence.conf}# file. See the live-persistence.conf(5) man page for how "
"to handle that case if you really need it (hint: you usually don't)."
msgstr ""
+"Es poden utilitzar diversos volums diferents de muntatges personalitzats "
+"(amb els seus propis fitxers #{live-persistence.conf}# però si diversos "
+"volums fan que el mateix directori sigui persistent, només s'utilitzarà un "
+"d'ells. Si qualsevol dels dos muntatges són \"imbricats\" (és a dir, un és "
+"un sub-directori de l'altre) el directori pare es muntarà abans que el "
+"directori fill per evitar que amb el muntatge un directori no sigui ocultat "
+"per l'altre. Els muntatges personalitzats imbricats són problemàtics si "
+"estan enumerats en el mateix fitxer #{live-persistence.conf}#. Veure la "
+"pàgina de manual live-persistence.conf(5) per saber com manejar aquest cas, "
+"si realment es necessita (una pista: en general no cal fer-ho)."
#. type: Plain text
#: en/user_customization-runtime.ssi:168
msgid "3~ Using more than one persistence store"
-msgstr ""
+msgstr "3~ Utilitzar més d'un magatzem de persistència"
#. type: Plain text
#: en/user_customization-runtime.ssi:169
@@ -579,3 +746,11 @@ msgid ""
"persistence partition labeled #{persistence-subText}# they would use the "
"boot parameters of: #{persistence}# #{persistence-label=subText}#."
msgstr ""
+"Si un usuari necessita múltiples magatzems de persistència del mateix tipus "
+"per a diferents ubicacions o proves, com #{persistence-nonwork}# i #"
+"{persistence-work}#, el paràmetre d'arrencada #{persistence-label}# "
+"utilitzat juntament amb el paràmetre d'arrencada #{persistence}# permetrà "
+"tenir diversos medis amb la mateixa persistència. Un exemple seria si un "
+"usuari vol escollir una partició amb persistència amb l'etiqueta #"
+"{persistence-subText}# utilitzaria els paràmetres d'arrencada: #{persistence}"
+"# #{persistence-label=subText}#."
diff --git a/manual/po/ca/user_examples.ssi.po b/manual/po/ca/user_examples.ssi.po
index 7c61658..965532c 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-10 22:48+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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:266
#, 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 ""
+msgstr " $ lb config\n"
#. 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:235
#, no-wrap
msgid " # lb build\n"
-msgstr ""
+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 ""
@@ -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,91 @@ 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 initial "
+"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:197
+msgid ""
+"As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you "
+"may need to re-add some recommended packages to make your image work "
+"properly."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:199
+msgid "An easy way to list recommends is using /{apt-cache}/. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:203
+#, no-wrap
+msgid " $ apt-cache depends live-config live-boot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
+msgid ""
+"In this example we found out that we had to re-include several packages "
+"recommended by live-config and live-boot: #{user-setup}# to make autologin "
+"work and #{sudo}# as an essential program to shutdown the system. Besides, "
+"it could be handy to add #{live-tools}# to be able to copy the image to RAM "
+"and #{eject}# to eventually eject the live media, So:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:211
+#, fuzzy
+#| msgid ""
+#| " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my."
+#| "list.chroot\n"
+msgid ""
+"$ echo \"live-tools user-setup sudo eject\" > config/package-lists/"
+"recommends.list.chroot"
+msgstr ""
+" $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my."
+"list.chroot\n"
+
+#. type: Plain text
+#: en/user_examples.ssi:215
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:221
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -583,7 +632,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:224
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -591,7 +640,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:227
#, no-wrap
msgid ""
" exit\n"
@@ -599,92 +648,114 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:231
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:239
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:241
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:243
#, 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:245
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:250
#, 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:254
+msgid ""
+"To make the image work properly, we must re-add, at least, two recommended "
+"packages which are left out by the #{--apt-recommends false}# option. See "
+"{Tweaking APT to save space}#tweaking-apt-to-save-space"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:258
+#, fuzzy, no-wrap
+#| msgid " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+msgid " $ echo \"user-setup sudo\" > config/package-lists/recommends.list.chroot\n"
+msgstr " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
+
+#. type: Plain text
+#: en/user_examples.ssi:262
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:270
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:272
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."
+"chroot}# hook removes some unused packages and files."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:274
+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:276
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:278
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:280
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -692,7 +763,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:282
msgid ""
"Our initial problem is the discovery of the names of the appropriate "
"language tasks. Currently, live-build cannot help with this. While we might "
@@ -702,18 +773,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:260
+#: en/user_examples.ssi:286
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:264
+#: en/user_examples.ssi:290
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:295
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -721,14 +792,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:299
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:279
+#: en/user_examples.ssi:305
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -737,17 +808,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:309
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
-"latin1 keyboard layout. We will also need to preseed our desktop choice, "
-"\"kde\" so that tasksel will install the correct desktop task, as it differs "
-"from the default (see {Desktop and languages tasks}#desktop-and-language-"
-"tasks). Now let's put the pieces together:"
+"latin1 keyboard layout. Now let's put the pieces together. Recalling from "
+"{Using metapackages}#using-metapackages that task metapackages are prefixed #"
+"{task-}#, we just specify these language boot parameters, then add standard "
+"priority packages and all our discovered task metapackages to our package "
+"list as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:297
+#: en/user_examples.ssi:323
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -757,14 +829,14 @@ msgid ""
" -k 486 \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
-" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
-" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
-" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \\\n"
+" task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:300
+#: en/user_examples.ssi:326
msgid ""
"Note that we have included the debian-installer-launcher package to launch "
"the installer from the live desktop, and have also specified the 486 flavour "
diff --git a/manual/po/ca/user_installation.ssi.po b/manual/po/ca/user_installation.ssi.po
index fcd49d0..2c02546 100644
--- a/manual/po/ca/user_installation.ssi.po
+++ b/manual/po/ca/user_installation.ssi.po
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-16 18:50+0300\n"
-"PO-Revision-Date: 2012-06-20 00:12+0200\n"
+"POT-Creation-Date: 2012-08-08 13:49+0300\n"
+"PO-Revision-Date: 2012-08-08 22:44+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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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,60 +107,61 @@ 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
-msgstr ""
+msgstr " $ lb config --archives live.debian.net\n"
#. type: Plain text
#: en/user_installation.ssi:2
@@ -193,8 +195,8 @@ msgstr "_* Una versió actualitzada de live-build"
#. type: Plain text
#: en/user_installation.ssi:14
-msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
-msgstr "_* Una shell compatible amb POSIX, com ara /{bash}/ o /{dash}/."
+msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/"
+msgstr "_* Una shell compatible amb POSIX, com ara /{bash}/ o /{dash}/"
#. type: Plain text
#: en/user_installation.ssi:16
@@ -203,8 +205,8 @@ msgstr "_* /{debootstrap}/ o /{cdebootstrap}/"
#. type: Plain text
#: en/user_installation.ssi:18
-msgid "_* Linux 2.6.x"
-msgstr "_* Linux 2.6.x"
+msgid "_* Linux 2.6.x or 3.x"
+msgstr "_* Linux 2.6.x o 3.x"
#. type: Plain text
#: en/user_installation.ssi:20
@@ -264,7 +266,7 @@ msgstr "Només cal instaŀlar live-build com qualsevol altre paquet:"
#: en/user_installation.ssi:40
#, no-wrap
msgid " # apt-get install live-build\n"
-msgstr ""
+msgstr " # apt-get install live-build\n"
#. type: Plain text
#: en/user_installation.ssi:44
@@ -275,7 +277,7 @@ msgstr "o"
#: en/user_installation.ssi:48
#, no-wrap
msgid " # aptitude install live-build\n"
-msgstr ""
+msgstr " # aptitude install live-build\n"
#. type: Plain text
#: en/user_installation.ssi:52 en/user_installation.ssi:108
@@ -297,7 +299,7 @@ msgstr ""
#: en/user_installation.ssi:58
#, no-wrap
msgid " $ git clone git://live.debian.net/git/live-build.git\n"
-msgstr ""
+msgstr " $ git clone git://live.debian.net/git/live-build.git\n"
#. type: Plain text
#: en/user_installation.ssi:62
@@ -313,6 +315,9 @@ msgid ""
" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
" $ cd ..\n"
msgstr ""
+" $ cd live-build\n"
+" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
+" $ cd ..\n"
#. type: Plain text
#: en/user_installation.ssi:72
@@ -327,7 +332,7 @@ msgstr ""
#: en/user_installation.ssi:76
#, no-wrap
msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
-msgstr ""
+msgstr " # dpkg -i live-build_2.0.8-1_all.deb\n"
#. type: Plain text
#: en/user_installation.ssi:80
@@ -339,7 +344,7 @@ msgstr ""
#: en/user_installation.ssi:84
#, no-wrap
msgid " # make install\n"
-msgstr ""
+msgstr " # make install\n"
#. type: Plain text
#: en/user_installation.ssi:88
@@ -350,10 +355,10 @@ msgstr "i desinstaŀlar amb:"
#: en/user_installation.ssi:92
#, no-wrap
msgid " # make uninstall\n"
-msgstr ""
+msgstr " # make uninstall\n"
#. type: Plain text
-#: en/user_installation.ssi:96 en/user_installation.ssi:142
+#: en/user_installation.ssi:96 en/user_installation.ssi:149
msgid "3~ From 'snapshots'"
msgstr "3~ A partir d'instantànies"
@@ -410,6 +415,8 @@ msgid ""
" $ git clone git://live.debian.net/git/live-boot.git\n"
" $ git clone git://live.debian.net/git/live-config.git\n"
msgstr ""
+" $ git clone git://live.debian.net/git/live-boot.git\n"
+" $ git clone git://live.debian.net/git/live-config.git\n"
#. type: Plain text
#: en/user_installation.ssi:121
@@ -464,31 +471,61 @@ msgid ""
" $ cd ../live-config\n"
" $ dpkg-buildpackage -b -uc -us\n"
msgstr ""
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
#. type: Plain text
#: en/user_installation.ssi:138
-msgid "_* Use all generated .deb files"
-msgstr "_* Utilitzar tots el fitxers .deb generats"
+msgid "_* Use applicable generated .deb files"
+msgstr "_* Utilitzar tots el fitxers .deb generats que calguin"
#. type: Plain text
#: en/user_installation.ssi:140
msgid ""
"As live-boot and live-config are installed by live-build system, installing "
"the packages in the host system is not sufficient: you should treat the "
-"generated .deb files like any other custom packages. Please see {Customizing "
-"package installation}#customizing-package-installation for more information. "
-"You should pay particular attention to {Additional repositories}#additional-"
-"repositories."
+"generated .deb files like any other custom packages. Since your purpose for "
+"building from source is like to test new things over the short term before "
+"the official release, follow {Installing modified or third-party packages}"
+"#installing-modified-or-third-party-packages to temporarily include the "
+"relevant files in your configuration. In particular, notice that both "
+"packages are divided into a generic part, a documentation part and one or "
+"more back-ends. Include the generic part, only one back-end matching your "
+"configuration, and optionally the documentation. Assuming you are building a "
+"live image in the current directory and have generated all .deb files for a "
+"single version of both packages in the directory above, these bash commands "
+"would copy all of the relevant packages including default back-ends:"
+msgstr ""
+"Com live-boot y live-config són instaŀlats per el sistema de construcció "
+"live-build, la instaŀlació dels paquets en el sistema amfitrió no és "
+"suficient: s'ha de tractar els .deb generats com si fossin uns paquets "
+"personalitzats. Ja que el propòsit per construir aquests paquets a partir "
+"del codi font és per provar coses noves a curt termini abans del llançament "
+"oficial, seguir els pasos de {Instaŀlació de paquets modificats o de tercers}"
+"#installing-modified-or-third-party-packages per incloure temporalment els "
+"paquets rellevants en la configuració. En particular, cal observar que "
+"ambdós paquets es divideixen en una part genèrica, una part de documentació "
+"i un o més back-ends. Incloure la part genèrica, només un dels back-end que "
+"coincideixi amb la configuració, i, opcionalment, la documentació. Suposant "
+"que s'està construint una imatge en viu en el directori actual i que s'han "
+"generat tots els .deb per a una única versió dels dos paquets al directori "
+"superior, aquestes ordres de bash són per copiar tots els paquets "
+"importants, incloent-hi els back-ends per defecte:"
+
+#. type: Plain text
+#: en/user_installation.ssi:145
+#, no-wrap
+msgid ""
+" $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/\n"
+" $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/\n"
msgstr ""
-"Com live-boot i live-config són instaŀlats pel sistema live-build, instaŀlar "
-"els paquets en el sistema amfitrió no és suficient: S'han de tractar tots "
-"els fitxers .deb generats igual que qualsevol altre paquet personalitzat. Si "
-"us plau veure {Personalització de l'instaŀlació de paquets}#customizing-"
-"package-installation per a més informació. S'ha de prestar especial atenció "
-"a {Repositoris addicionals}#additional-repositories."
+" $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/\n"
+" $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/\n"
#. type: Plain text
-#: en/user_installation.ssi:144
+#: en/user_installation.ssi:151
msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
diff --git a/manual/po/ca/user_managing_a_configuration.ssi.po b/manual/po/ca/user_managing_a_configuration.ssi.po
index 64d7eb2..0ebf33b 100644
--- a/manual/po/ca/user_managing_a_configuration.ssi.po
+++ b/manual/po/ca/user_managing_a_configuration.ssi.po
@@ -5,21 +5,21 @@
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-07 13:47+0300\n"
+"PO-Revision-Date: 2012-08-07 13:51+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"Language-Team: Catalan <debian-live at lists.debian.org>\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi: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"
@@ -178,174 +180,256 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:8
-msgid "2~ Use auto to manage configuration changes"
-msgstr "2~ Utilitzar auto per gestionar canvis de configuració"
+msgid "2~ Dealing with configuration changes"
+msgstr "2~ Gestionar canvis a la 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."
+"Les configuracions en viu poques vegades són perfectes al primer intent. "
+"Passar opcions de #{lb config}# des de la línea d'ordres pot estar be per "
+"construir una imatge una vegada, però és més típic revisar aquestes opcions "
+"i construir de nou fins que se'n estigui satisfet. Per donar suport a "
+"aquests canvis, es poden utilitzar scripts auto que assegurin que la seva "
+"configuració es manté en un estat coherent."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
-msgid ""
-"For example, when the distribution is first set, many 'dependent' variables "
-"are given default values that suit that distribution. However, if you later "
-"decide to change the distribution, those dependent variables continue to "
-"retain old values that are no longer appropriate."
-msgstr ""
-"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."
+msgid "3~ Why use auto scripts? What do they do?"
+msgstr "3~ Per què utilitzar scripts auto? Què fan?"
#. 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."
+"L'ordre #{lb config}# emmagatzema les opcions que se li passen en els "
+"fitxers de #{config/*}#, juntament amb moltes altres opcions que estan "
+"establertes als valors per defecte. Si s'executa un cop més, #{lb config}# "
+"no restablirà cap de les opcios dependents basades en les opcions inicials. "
+"Així, per exemple, si s'executa #{lb config}# de nou amb un nou valor per #"
+"{--distribution}#, totes les opcions que en depenen que es van omplir per a "
+"la distribució per defecte ja no poden funcionar amb la nova. Tampoc són "
+"aquests fitxers destinats a ser llegits o editats. S'emmagatzemen els valors "
+"per més de cent opcions, i ningú serà capaç de veure aquestes opcions que "
+"s'han especificat realment. I, finalment, si s'executa #{lb config}# i a "
+"continuació s'actualitza live-build i canvia el nom d'una opció, #{config/*}"
+"# encara conté les variables de l'opció vella que ja no són vàlides."
#. 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/*}#)."
+"Per a més comoditat, live-build ve amb uns scripts d'exemple per copiar i "
+"editar. Iniciar una nova configuració per defecte, i a continuació, copiar "
+"els exemples:"
#. 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 ""
+" $ mkdir mylive && cd mylive && lb config\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:29
+msgid "Edit #{auto/config}#, adding any options as you see fit. For instance:"
+msgstr ""
+"Editar #{auto/config}#, afegint les opcions com millor li sembli. Per "
+"exemple:"
+
+#. 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 ""
+" #!/bin/sh\n"
+" lb config noauto \\\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"
#. 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 ""
+"Ara, cada vegada que s'utilitzi #{lb config}#, #{auto/config}# restablirà la "
+"configuració basada en aquestes opcions. Quan es vulguin fer canvis, editar "
+"les opcions d'aquest fitxer en lloc de passar-les a #{lb config}#. Quan "
+"s'utilitza #{lb clean}#, #{auto/clean}# netejarà els fitxers de #{config/*}# "
+"juntament amb els altres productes de construcció. I, finalment, quan "
+"s'utilitza #{lb build}#, es crea un log de la construcció mitjançant #{auto/"
+"build}# anomenat #{build.log}#."
#. 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 ""
+"Nota: Aquí s'utilitza un paràmetre especial #{noauto}# per suprimir un altra "
+"crida a #{auto/config}#, la qual cosa impedeix la recursivitat infinita. "
+"Assegurar-se de no eliminarlo accidentalment fent canvis. També, tenir cura "
+"de que quan es divideix l'ordre #{lb config}# a través de diverses línies "
+"per facilitar la lectura, com es mostra en l'exemple anterior, no s'oblidi "
+"la barra invertida (\\) al final de cada línia que segueix a la següent."
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:45
-msgid "#{auto/build}#"
-msgstr ""
+#: en/user_managing_a_configuration.ssi:48
+msgid "2~ Clone a configuration published via Git"
+msgstr "2~ Clonar una configuració publicada via Git"
#. 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}# 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 --config git://live.debian.net/git/config-rescue.git\n"
msgstr ""
+" $ mkdir live-rescue && cd live-rescue\n"
+" $ lb config --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 --config ldn:config-rescue\n"
+msgstr " $ lb config --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 8af25b6..0efcd25 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-07-27 00:01+0300\n"
+"POT-Creation-Date: 2012-08-10 22:48+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-07-27\n"
+" :published: 2012-08-10\n"
msgstr ""
"@date:\n"
-" :published: 27.07.2012\n"
+" :published: 10.08.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -65,8 +65,8 @@ msgstr "@publisher: Debian Live Projekt <debian-live at lists.debian.org>"
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /squeeze|wheezy|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|jessie|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
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/style_guide.ssi.po b/manual/po/de/style_guide.ssi.po
index 9d4f5d4..77053a1 100644
--- a/manual/po/de/style_guide.ssi.po
+++ b/manual/po/de/style_guide.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 17:04+0300\n"
+"POT-Creation-Date: 2012-07-31 23:27+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -24,7 +24,7 @@ msgstr ":B~ Anhang"
#: 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
@@ -50,33 +50,35 @@ msgstr ":B~ Anhang"
#: 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: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: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:218
+#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
#: 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:350
+#: en/user_customization-packages.ssi:358 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: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_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
@@ -94,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
@@ -119,34 +121,36 @@ msgstr ""
#: 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:206
+#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:363 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: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_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
@@ -799,41 +803,21 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:220
msgid ""
-"Some translators decide to include the code blocks in the translated files "
-"because it is easier for them to identify what has already been translated "
-"and what has not by looking at the percentages if they use a graphical "
-"translation program."
+"Even though the code blocks are usually untranslatable, including them in "
+"the translation is the only way to score a 100% complete translation. And "
+"even though it means more work at first because it requires the intervention "
+"of the translators if the code changes, it is the best way, in the long run, "
+"to identify what has already been translated and what has not when checking "
+"the integrity of the .po files."
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:222
-msgid ""
-"Include the code blocks if you want to score a 100% complete translation."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:224
-msgid ""
-"On the other hand some translators prefer to leave the code blocks "
-"\"untranslated\" (i.e. not including them). This makes the translation "
-"easier to maintain once finished because it does not require translators "
-"intervention if the code changes."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:226
-msgid ""
-"Leave the code blocks empty (they will be automatically added then) if you "
-"want to make your translation easier to maintain."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:228
msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:230
+#: en/style_guide.ssi:224
msgid ""
"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
@@ -842,48 +826,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:232
+#: en/style_guide.ssi:226
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:234
+#: en/style_guide.ssi:228
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:236
+#: en/style_guide.ssi:230
msgid "Translators should never translate:"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:238
+#: en/style_guide.ssi:232
msgid "The code names of releases"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:240
+#: en/style_guide.ssi:234
msgid "The names of programs"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:242
+#: en/style_guide.ssi:236
msgid "The commands given as examples"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:244
+#: en/style_guide.ssi:238
msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:246
+#: en/style_guide.ssi:240
msgid "Links"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:247
+#: en/style_guide.ssi:241
msgid "Paths"
msgstr ""
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 1c160b1..3a466d5 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-04-14 22:45+0300\n"
+"POT-Creation-Date: 2012-08-10 22:48+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-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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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-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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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 ""
@@ -176,10 +178,10 @@ msgid ""
"areas. To ensure decent download speeds, you should choose a nearby "
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
-"can define your own lists of packages to include, use live-build's "
-"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
-"Finally, a number of options give some control over /{apt}/, or if you "
-"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"can define lists of packages, including metapackages which will install many "
+"related packages at once, such as packages for a particular desktop or "
+"language. Finally, a number of options give some control over /{apt}/, or if "
+"you prefer, /{aptitude}/, at build time when packages are installed. You may "
"find these handy if you use a proxy, want to disable installation of "
"recommended packages to save space, or need to control which versions of "
"packages are installed via APT pinning, to name a few possibilities."
@@ -210,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 ""
@@ -382,7 +384,7 @@ msgid "*{Note:}* some preconfigured package repositories are available for easy
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
msgstr ""
@@ -397,10 +399,11 @@ msgstr ""
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"individual packages to install in a package list. You can also choose "
-"predefined lists of packages, or use APT tasks. And finally, you may place "
-"package files in your #{config/}# tree, which is well suited to testing of "
-"new or experimental packages before they are available from a repository."
+"individual packages to install in a package list. You can also use "
+"metapackages in those lists, or select them using package control file "
+"fields. And finally, you may place package files in your #{config/}# tree, "
+"which is well suited to testing of new or experimental packages before they "
+"are available from a repository."
msgstr ""
#. type: Plain text
@@ -414,11 +417,8 @@ msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
"which makes it easy to build lists from other lists and adapt them for use "
-"in multiple configurations. You can use predefined package lists, providing "
-"in a modular fashion package selections from each of the major desktop "
-"environments and some special purpose lists, as well as standard lists the "
-"others are based upon. You can also provide your own package lists, or use a "
-"combination of both."
+"in multiple configurations. Package names may also be injected into the list "
+"using shell helpers at build time."
msgstr ""
#. type: Plain text
@@ -429,45 +429,87 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:97
-msgid "3~ Predefined package lists"
+msgid "3~using-metapackages Using metapackages"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:99
msgid ""
-"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--package-lists}# option. For example:"
+"The simplest way to populate your package list is to use a task metapackage "
+"maintained by your distribution. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:104
#, no-wrap
-msgid " $ lb config --package-lists \"gnome rescue\"\n"
+msgid ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:108
+msgid ""
+"This supercedes the older predefined list method supported in #{live-build}# "
+"2.x. Unlike predefined lists, task metapackages are not specific to the "
+"Debian Live project. Instead, they are maintained by specialist working "
+"groups within the distribution and therefore reflect the consensus of each "
+"group about which packages best serve the needs of the intended users. They "
+"also cover a much broader range of use cases than the predefined lists they "
+"replace."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:110
msgid ""
-"The default location for the list files on your system is #{/usr/share/live/"
-"build/package-lists/}#. To determine the packages in a given list, read the "
-"corresponding file, paying attention to included files and conditionals as "
-"described in the following sections."
+"All task metapackages are prefixed #{task-}#, so a quick way to determine "
+"which are available (though it may contain a handful of false hits that "
+"match the name but aren't metapackages) is to match on the package name with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:114
+#, no-wrap
+msgid " $ apt-cache search --names-only ^task-\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:118
+msgid ""
+"In addition to these, you will find other metapackages with various "
+"purposes. Some are subsets of broader task packages, like #{gnome-core}#, "
+"while others are individual specialized parts of a Debian Pure Blend, such "
+"as the #{education-*}# metapackages. To list all metapackages in the "
+"archive, install the #{debtags}# package and list all packages with the #"
+"{role::metapackage}# tag as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:122
+#, no-wrap
+msgid " $ debtags search role::metapackage\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:128
msgid ""
-"You may supplement the predefined lists using local package lists stored in #"
-"{config/package-lists/}#."
+"Whether you list metapackages, individual packages, or a combination of "
+"both, all local package lists are stored in #{config/package-lists/}#. Since "
+"more than one list can be used, this lends itself well to modular designs. "
+"For example, you may decide to devote one list to a particular choice of "
+"desktop, another to a collection of related packages that might as easily be "
+"used on top of a different desktop. This allows you to experiment with "
+"different combinations of sets of packages with a minimum of fuss, sharing "
+"common lists between different live image projects."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -475,18 +517,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:132
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:134
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:136
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -497,41 +539,46 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "3~ Extending a provided package list using includes"
+#: en/user_customization-packages.ssi:138
+msgid "3~generated-package-lists Generated package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:140
msgid ""
-"The package lists that are included with live-build make extensive use of "
-"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
-"directory, as they serve as good examples of how to write your own 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 "
+"command to be executed within the chroot when the image is built. For "
+"example, one might include the line #{! grep-aptavail -n -sPackage -"
+"FPriority standard | sort}# in a package list to produce a sorted list of "
+"available packages with #{Priority: standard}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:142
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list "
-"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
-"following contents:"
+"In fact, selecting packages with the #{grep-aptavail}# command (from the #"
+"{dctrl-tools}# package) is so useful that #{live-build}# provides a #"
+"{Packages}# helper script as a convenience. This script takes two arguments: "
+"#{field}# and #{pattern}#. Thus, you can create a list with the following "
+"contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
-" #include <gnome>\n"
-" iceweasel\n"
+" $ lb config\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -542,14 +589,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
@@ -558,7 +605,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:165
msgid ""
"You may test for any one of a number of values, e.g. to install /"
"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
@@ -566,7 +613,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURES i386 amd64\n"
@@ -575,7 +622,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:175
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
@@ -583,7 +630,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -592,12 +639,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
@@ -606,51 +653,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:180
-msgid "3~ Tasks"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid ""
-"The Debian Installer offers the user choices of a number of preselected "
-"lists of packages, each one focused on a particular kind of system, or task "
-"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
-"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
-"by APT through the \"Task:\" field. You can specify one or more tasks in "
-"live-build by putting them in a list in #{config/task-lists/}#, as in the "
-"example below."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:187
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:191
-msgid ""
-"The primary tasks available in the Debian Installer can be listed with #"
-"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including the ones not included in this list, may be examined with #{tasksel "
-"--task-packages}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:197
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:199
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -664,7 +677,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:201
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -675,57 +688,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:203
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
"you want them, you need to specify them in your configuration. For example, "
"a GNOME desktop image containing support for Japanese might include these "
-"tasks:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:205
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
-" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
+"task metapackages:"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:209
-msgid ""
-"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value, if it differs from the "
-"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
-"variable or else tasksel will not recognize and install it. Thus:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:214
#, no-wrap
msgid ""
" $ lb config\n"
-" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:218
-msgid ""
-"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
-"\"."
+" $ echo \"task-gnome-desktop task-laptop\" >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-japanese task-japanese-desktop task-japanese-gnome-desktop\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:213
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:215
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -736,7 +725,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:217
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -747,22 +736,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:219
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:221
msgid "_* #{packages.chroot}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:223
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:225
msgid ""
"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
"customizations but has a number of drawbacks, whilst using a custom APT "
@@ -770,12 +759,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:227
msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:229
msgid ""
"To install a custom package, simply copy it to the #{config/packages.chroot/}"
"# directory. Packages that are inside this directory will be automatically "
@@ -784,45 +773,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:231
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:233
msgid ""
"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:235
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:237
msgid ""
"_* You must install all appropriate packages in the #{config/packages."
"chroot/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:239
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:241
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:243
msgid ""
"Unlike using #{packages.chroot}#, when using a custom APT repository you "
"must ensure that you specify the packages elsewhere. See {Choosing packages "
@@ -830,7 +819,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:245
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -838,12 +827,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:247
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:249
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -853,7 +842,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:251
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -863,12 +852,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:253
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:255
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -879,12 +868,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:257
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:259
msgid ""
"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -894,26 +883,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:261
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:263
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:265
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:267
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -921,18 +910,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:271
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:282
-msgid "3~ Tweaking APT to save space"
+#: en/user_customization-packages.ssi:275
+msgid "3~tweaking-apt-to-save-space Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:277
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -940,20 +929,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:279
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:283
#, no-wrap
msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:287
msgid ""
"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
@@ -963,41 +952,56 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:289
msgid ""
"If you find the installation of recommended packages bloats your image too "
-"much, you may disable that default option of APT with:"
+"much, provided you are prepared to deal with the consequences discussed "
+"below, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:293
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:304
+#: en/user_customization-packages.ssi:297
msgid ""
-"The tradeoff here is that if you don't install recommended packages for a "
-"given package, that is, \"packages that would be found together with this "
-"one in all but unusual installations\" (Debian Policy Manual, section 7.2), "
-"some packages that you actually need may be omitted. Therefore, we suggest "
-"you review the difference turning off recommends makes to your packages list "
-"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
-"in your list any missing packages that you still want installed. "
-"Alternatively, if you find you only want a small number of recommended "
-"packages left out, leave recommends enabled and set a negative APT pin "
-"priority on selected packages to prevent them from being installed, as "
-"explained in {APT pinning}#apt-pinning."
+"The most important consequence of turning off recommends is that #{live-boot}"
+"# and #{live-config}# themselves recommend some packages that provide "
+"important functionality used by most Live configurations, such as #{user-"
+"setup}# which #{live-config}# recommends and is used to create the live "
+"user. In all but the most exceptional circumstances you need to add back at "
+"least some of these recommends to your package lists or else your image will "
+"not work as expected, if at all. Look at the recommended packages for each "
+"of the #{live-*}# packages included in your build and if you are not certain "
+"you can omit them, add them back into your package lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:299
+msgid ""
+"The more general consequence is that if you don't install recommended "
+"packages for any given package, that is, \"packages that would be found "
+"together with this one in all but unusual installations\" (Debian Policy "
+"Manual, section 7.2), some packages that users of your Live system actually "
+"need may be omitted. Therefore, we suggest you review the difference turning "
+"off recommends makes to your packages list (see the #{binary.packages}# file "
+"generated by #{lb build}#) and re-include in your list any missing packages "
+"that you still want installed. Alternatively, if you find you only want a "
+"small number of recommended packages left out, leave recommends enabled and "
+"set a negative APT pin priority on selected packages to prevent them from "
+"being installed, as explained in {APT pinning}#apt-pinning."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:301
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:303
msgid ""
"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1006,12 +1010,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:305
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:307
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1020,7 +1024,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:309
msgid ""
"Let's say you are building a wheezy live system but need all the live "
"packages that end up in the binary image to be installed from sid at build "
@@ -1031,7 +1035,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:322
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
@@ -1042,7 +1046,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" Package: *\n"
@@ -1052,31 +1056,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:326
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:330
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:334
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
-"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
-"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
-"{gnome-keyring}/ package. This can be done by adding the following stanza to "
-"#{config/chroot_apt/preferences}#:"
+"package. Suppose you are building an LXDE image using #{task-lxde-desktop}# "
+"in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the "
+"user prompted to store wifi passwords in the keyring. This metapackage "
+"depends on /{lxde-core}/, which recommends /{gksu}/, which in turn "
+"recommends /{gnome-keyring}/. So you want to omit the recommended /{gnome-"
+"keyring}/ package. This can be done by adding the following stanza to #"
+"{config/chroot_apt/preferences}#:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:345
+#: en/user_customization-packages.ssi:340
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index a7b7a22..8b3fb5f 100644
--- a/manual/po/de/user_customization-runtime.ssi.po
+++ b/manual/po/de/user_customization-runtime.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-07-27 21:48+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -292,8 +292,8 @@ msgstr ""
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 "
+"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:"
@@ -348,7 +348,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ 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"
msgstr ""
#. type: Plain text
@@ -358,10 +358,10 @@ msgid ""
"{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:"
+"# 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:"
msgstr ""
#. type: Plain text
@@ -369,7 +369,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 0ef6493..69d9685 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-10 22:48+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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:266
#, 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:235
#, 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,85 @@ 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 initial "
+"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:197
+msgid ""
+"As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you "
+"may need to re-add some recommended packages to make your image work "
+"properly."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:199
+msgid "An easy way to list recommends is using /{apt-cache}/. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:203
+#, no-wrap
+msgid " $ apt-cache depends live-config live-boot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
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}#:"
+"In this example we found out that we had to re-include several packages "
+"recommended by live-config and live-boot: #{user-setup}# to make autologin "
+"work and #{sudo}# as an essential program to shutdown the system. Besides, "
+"it could be handy to add #{live-tools}# to be able to copy the image to RAM "
+"and #{eject}# to eventually eject the live media, So:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:211
+msgid ""
+"$ echo \"live-tools user-setup sudo eject\" > config/package-lists/"
+"recommends.list.chroot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:215
+msgid ""
+"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:221
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -584,7 +624,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:224
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -592,7 +632,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:227
#, no-wrap
msgid ""
" exit\n"
@@ -600,92 +640,113 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:231
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:239
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:241
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:243
#, 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:245
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:250
#, 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:254
+msgid ""
+"To make the image work properly, we must re-add, at least, two recommended "
+"packages which are left out by the #{--apt-recommends false}# option. See "
+"{Tweaking APT to save space}#tweaking-apt-to-save-space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:258
+#, no-wrap
+msgid " $ echo \"user-setup sudo\" > config/package-lists/recommends.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:262
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:270
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:272
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."
+"chroot}# hook removes some unused packages and files."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:274
+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:276
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:278
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:280
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -693,7 +754,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:282
msgid ""
"Our initial problem is the discovery of the names of the appropriate "
"language tasks. Currently, live-build cannot help with this. While we might "
@@ -703,18 +764,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:260
+#: en/user_examples.ssi:286
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:264
+#: en/user_examples.ssi:290
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:295
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -722,14 +783,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:299
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:279
+#: en/user_examples.ssi:305
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -738,17 +799,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:309
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
-"latin1 keyboard layout. We will also need to preseed our desktop choice, "
-"\"kde\" so that tasksel will install the correct desktop task, as it differs "
-"from the default (see {Desktop and languages tasks}#desktop-and-language-"
-"tasks). Now let's put the pieces together:"
+"latin1 keyboard layout. Now let's put the pieces together. Recalling from "
+"{Using metapackages}#using-metapackages that task metapackages are prefixed #"
+"{task-}#, we just specify these language boot parameters, then add standard "
+"priority packages and all our discovered task metapackages to our package "
+"list as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:297
+#: en/user_examples.ssi:323
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -758,14 +820,14 @@ msgid ""
" -k 486 \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
-" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
-" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
-" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \\\n"
+" task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:300
+#: en/user_examples.ssi:326
msgid ""
"Note that we have included the debian-installer-launcher package to launch "
"the installer from the live desktop, and have also specified the 486 flavour "
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index cda02f5..55930ff 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.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-08 13: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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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,57 +107,58 @@ 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
msgstr ""
@@ -193,7 +195,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:14
-msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
+msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/"
msgstr ""
#. type: Plain text
@@ -203,7 +205,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:18
-msgid "_* Linux 2.6.x"
+msgid "_* Linux 2.6.x or 3.x"
msgstr ""
#. type: Plain text
@@ -341,7 +343,7 @@ msgid " # make uninstall\n"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:96 en/user_installation.ssi:142
+#: en/user_installation.ssi:96 en/user_installation.ssi:149
msgid "3~ From 'snapshots'"
msgstr ""
@@ -434,7 +436,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:138
-msgid "_* Use all generated .deb files"
+msgid "_* Use applicable generated .deb files"
msgstr ""
#. type: Plain text
@@ -442,14 +444,29 @@ msgstr ""
msgid ""
"As live-boot and live-config are installed by live-build system, installing "
"the packages in the host system is not sufficient: you should treat the "
-"generated .deb files like any other custom packages. Please see {Customizing "
-"package installation}#customizing-package-installation for more information. "
-"You should pay particular attention to {Additional repositories}#additional-"
-"repositories."
+"generated .deb files like any other custom packages. Since your purpose for "
+"building from source is like to test new things over the short term before "
+"the official release, follow {Installing modified or third-party packages}"
+"#installing-modified-or-third-party-packages to temporarily include the "
+"relevant files in your configuration. In particular, notice that both "
+"packages are divided into a generic part, a documentation part and one or "
+"more back-ends. Include the generic part, only one back-end matching your "
+"configuration, and optionally the documentation. Assuming you are building a "
+"live image in the current directory and have generated all .deb files for a "
+"single version of both packages in the directory above, these bash commands "
+"would copy all of the relevant packages including default back-ends:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:145
+#, no-wrap
+msgid ""
+" $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/\n"
+" $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/\n"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:144
+#: en/user_installation.ssi:151
msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index c94cc38..8a7196e 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-07 13:47+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 ""
@@ -175,133 +177,180 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:8
-msgid "2~ Use auto to manage configuration changes"
+msgid "2~ Dealing with configuration changes"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
msgid ""
-"Live configurations rarely are perfect on the first try. You'll likely need "
-"to make a series of revisions until you are satisfied. However, "
-"inconsistencies can creep into your configuration from one revision to the "
-"next if you aren't careful. The main problem is, once a variable is given a "
-"default value, that value will not be recomputed from other variables that "
-"may change in later revisions."
+"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 use auto scripts? What do they do?"
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 --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 --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/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index 4b5ccf5..efe0e8a 100644
--- a/manual/po/es/about_manual.ssi.po
+++ b/manual/po/es/about_manual.ssi.po
@@ -2,23 +2,22 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-24 19:21+0300\n"
-"PO-Revision-Date: 2012-06-24 19:49+0100\n"
-"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
-"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"PO-Revision-Date: 2012-08-07 13:59+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:2
@@ -511,7 +510,7 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:90
msgid "$ git clone git://live.debian.net/git/live-manual.git"
-msgstr ""
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
@@ -598,7 +597,7 @@ msgstr ""
#: en/about_manual.ssi:98
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
-msgstr ""
+msgstr " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
#. type: Plain text
#: en/about_manual.ssi:102
@@ -614,7 +613,7 @@ msgstr ""
#: en/about_manual.ssi:106
#, no-wrap
msgid " $ make build\n"
-msgstr ""
+msgstr " $ make build\n"
#. type: Plain text
#: en/about_manual.ssi:110
@@ -631,7 +630,7 @@ msgstr ""
#: en/about_manual.ssi:114
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
-msgstr ""
+msgstr " $ make build LANGUAGES=en\n"
#. type: Plain text
#: en/about_manual.ssi:118
@@ -642,7 +641,7 @@ msgstr "Es posible generar el documento por formato:"
#: en/about_manual.ssi:122
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
-msgstr ""
+msgstr " $ make build FORMATS=pdf\n"
#. type: Plain text
#: en/about_manual.ssi:126
@@ -653,7 +652,7 @@ msgstr "O combinar ambos, por ejemplo:"
#: en/about_manual.ssi:130
#, no-wrap
msgid " $ make build LANGUAGES=it FORMATS=html\n"
-msgstr ""
+msgstr " $ make build LANGUAGES=it FORMATS=html\n"
#. type: Plain text
#: en/about_manual.ssi:134
@@ -688,6 +687,12 @@ msgid ""
" -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
msgstr ""
+" $ mkdir -p ~/.ssh/identity.d\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
#. type: Plain text
#: en/about_manual.ssi:151
@@ -707,6 +712,12 @@ msgid ""
" IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
" EOF\n"
msgstr ""
+" $ cat >> ~/.ssh/config << EOF\n"
+" Host live.debian.net\n"
+" Hostname live.debian.net\n"
+" User git\n"
+" IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
+" EOF\n"
#. type: Plain text
#: en/about_manual.ssi:164
@@ -720,6 +731,8 @@ msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
" $ cd live-manual && git checkout debian-next\n"
msgstr ""
+" $ git clone git at live.debian.net:/live-manual.git\n"
+" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
#: en/about_manual.ssi:173
@@ -760,7 +773,7 @@ msgstr ""
#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
-msgstr ""
+msgstr " $ git commit -a -m \"Adding a section on applying patches.\"\n"
#. type: Plain text
#: en/about_manual.ssi:185
@@ -773,7 +786,7 @@ msgstr ""
#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
-msgstr ""
+msgstr " $ git push\n"
#. type: Plain text
#: en/about_manual.ssi:193
diff --git a/manual/po/es/about_project.ssi.po b/manual/po/es/about_project.ssi.po
index 1b76033..2f781f6 100644
--- a/manual/po/es/about_project.ssi.po
+++ b/manual/po/es/about_project.ssi.po
@@ -2,8 +2,8 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
"PO-Revision-Date: 2012-02-19 21:29+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/manual/po/es/index.html.in.po b/manual/po/es/index.html.in.po
index 64408e1..586c79d 100644
--- a/manual/po/es/index.html.in.po
+++ b/manual/po/es/index.html.in.po
@@ -2,8 +2,8 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
"PO-Revision-Date: 2011-12-26 19:07+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index b7ea112..f9e7c70 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -2,26 +2,26 @@
# Copyright (C) 2011-2012 José Luis Zabalza <jlz.3008 at gmail.com>
# Copyright (C) 2011-2012 Carlos Zuferri «chals» <chals at altorricon.com>
# This file is distributed under the same license as the live-manual package.
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-27 00:01+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"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
+"POT-Creation-Date: 2012-08-10 22:48+0300\n"
+"PO-Revision-Date: 2012-08-07 14:03+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/live-manual.ssm:2
msgid "% SiSU 2.0"
-msgstr ""
+msgstr "% SiSU 2.0"
#. type: Plain text
#: en/live-manual.ssm:4
@@ -50,10 +50,10 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-07-27\n"
+" :published: 2012-08-10\n"
msgstr ""
"@date:\n"
-" :published: 27.07.2012\n"
+" :published: 10.08.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -65,16 +65,21 @@ msgstr "@publisher: Proyecto Debian Live <debian-live at lists.debian.org>"
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /squeeze|wheezy|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|jessie|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
+"@make:\n"
+" :bold: /squeeze|wheezy|jessie|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/\n"
+" :num_top: 1\n"
+" :skin: skin_debian-live\n"
#. type: Plain text
#: en/live-manual.ssm:23
msgid ":A~ @title"
-msgstr ""
+msgstr ":A~ @title"
#. type: Plain text
#: en/live-manual.ssm:25
@@ -84,12 +89,12 @@ msgstr ":B~ Acerca de este manual"
#. type: Plain text
#: en/live-manual.ssm:27
msgid "<< about_manual.ssi"
-msgstr ""
+msgstr "<< about_manual.ssi"
#. type: Plain text
#: en/live-manual.ssm:29
msgid "<< about_project.ssi"
-msgstr ""
+msgstr "<< about_project.ssi"
#. type: Plain text
#: en/live-manual.ssm:31
@@ -99,52 +104,52 @@ msgstr ":B~ Usuario"
#. type: Plain text
#: en/live-manual.ssm:33
msgid "<< user_installation.ssi"
-msgstr ""
+msgstr "<< user_installation.ssi"
#. type: Plain text
#: en/live-manual.ssm:35
msgid "<< user_basics.ssi"
-msgstr ""
+msgstr "<< user_basics.ssi"
#. type: Plain text
#: en/live-manual.ssm:37
msgid "<< user_overview.ssi"
-msgstr ""
+msgstr "<< user_overview.ssi"
#. type: Plain text
#: en/live-manual.ssm:39
msgid "<< user_managing_a_configuration.ssi"
-msgstr ""
+msgstr "<< user_managing_a_configuration.ssi"
#. type: Plain text
#: en/live-manual.ssm:41
msgid "<< user_customization-overview.ssi"
-msgstr ""
+msgstr "<< user_customization-overview.ssi"
#. type: Plain text
#: en/live-manual.ssm:43
msgid "<< user_customization-packages.ssi"
-msgstr ""
+msgstr "<< user_customization-packages.ssi"
#. type: Plain text
#: en/live-manual.ssm:45
msgid "<< user_customization-contents.ssi"
-msgstr ""
+msgstr "<< user_customization-contents.ssi"
#. type: Plain text
#: en/live-manual.ssm:47
msgid "<< user_customization-runtime.ssi"
-msgstr ""
+msgstr "<< user_customization-runtime.ssi"
#. type: Plain text
#: en/live-manual.ssm:49
msgid "<< user_customization-binary.ssi"
-msgstr ""
+msgstr "<< user_customization-binary.ssi"
#. type: Plain text
#: en/live-manual.ssm:51
msgid "<< user_customization-installer.ssi"
-msgstr ""
+msgstr "<< user_customization-installer.ssi"
#. type: Plain text
#: en/live-manual.ssm:53
@@ -154,17 +159,17 @@ msgstr ":B~ Proyecto"
#. type: Plain text
#: en/live-manual.ssm:55
msgid "<< project_bugs.ssi"
-msgstr ""
+msgstr "<< project_bugs.ssi"
#. type: Plain text
#: en/live-manual.ssm:57
msgid "<< project_coding-style.ssi"
-msgstr ""
+msgstr "<< project_coding-style.ssi"
#. type: Plain text
#: en/live-manual.ssm:59
msgid "<< project_procedures.ssi"
-msgstr ""
+msgstr "<< project_procedures.ssi"
#. type: Plain text
#: en/live-manual.ssm:61 en/user_examples.ssi:2
@@ -174,7 +179,7 @@ msgstr ":B~ Ejemplos"
#. type: Plain text
#: en/live-manual.ssm:63
msgid "<< user_examples.ssi"
-msgstr ""
+msgstr "<< user_examples.ssi"
#. type: Plain text
#: en/live-manual.ssm:65 en/style_guide.ssi:2
@@ -184,4 +189,4 @@ msgstr ":B~ Apéndice"
#. type: Plain text
#: en/live-manual.ssm:66
msgid "<< style_guide.ssi"
-msgstr ""
+msgstr "<< style_guide.ssi"
diff --git a/manual/po/es/project_bugs.ssi.po b/manual/po/es/project_bugs.ssi.po
index 3a6df27..9d0dc72 100644
--- a/manual/po/es/project_bugs.ssi.po
+++ b/manual/po/es/project_bugs.ssi.po
@@ -2,23 +2,21 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-21 03:48+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"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
+"PO-Revision-Date: 2012-08-07 14:16+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -41,51 +39,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 +110,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"
@@ -174,12 +174,12 @@ msgstr "1~bugs Informes de errores."
#: 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 ""
"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 "
+"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."
@@ -227,13 +227,13 @@ msgstr "2~ Problemas conocidos"
#. 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 ""
"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."
+"especifica cualquiera de estas dos versiones como distribución objetivo."
#. type: Plain text
#: en/project_bugs.ssi:20
@@ -244,8 +244,8 @@ msgstr "% FIXME:"
#: 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 ""
"Si esto causa mucha dificultad, no se debe crear un sistema basado en *"
"{testing}* o *{unstable}*, sino que debe utilizarse *{stable}*. live-build "
@@ -320,9 +320,9 @@ 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 "
+"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 "
@@ -390,17 +390,17 @@ msgstr "_* Versión del kernel en el sistema en vivo."
#: 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 ""
"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}#; "
+"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)."
#. 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"
@@ -452,9 +452,9 @@ msgstr "2~ Aislar el fallo si es posible"
#: 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 "
@@ -480,9 +480,9 @@ msgstr "2~ Utilizar el paquete correcto sobre el que informar del error"
#. 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 ""
"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 "
@@ -491,8 +491,8 @@ 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 ""
"Sin embargo, se agradece si se intenta limitar la búsqueda a donde aparece "
"el error."
@@ -509,9 +509,9 @@ 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 ""
-"live-build arranca primero un sistema Debian básico con /{debootstrap}/ o /"
+"live-build crea 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 "
@@ -522,13 +522,13 @@ msgstr ""
#: 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 ""
"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."
+"mismo, por lo cual el equipo de Debian Live probablemente no pueda "
+"solucionarlo directamente. Informar del error sobre la herramienta de "
+"preinstalación o el paquete que falla."
#. type: Plain text
#: en/project_bugs.ssi:90
@@ -564,9 +564,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 ""
"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 "
@@ -582,14 +582,14 @@ msgstr "3~ En tiempo de arranque"
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 "
-"hay que olvidar mencionar, cómo y cuando la imagen falla, en Qemu, "
+"hay que olvidar mencionar, cómo y cuando la imagen falla, si es 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 "
@@ -604,10 +604,10 @@ msgstr "3~ En tiempo de ejecución"
#: 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 ""
"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,"
+"sistema en vivo, esto es probablemente un error en Debian Live. Sin embargo:"
#. type: Plain text
#: en/project_bugs.ssi:106
@@ -619,8 +619,8 @@ msgstr "2~ Hacer la investigación"
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 "
@@ -646,8 +646,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 ""
"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/project_coding-style.ssi.po b/manual/po/es/project_coding-style.ssi.po
index 2a9238e..1469f8a 100644
--- a/manual/po/es/project_coding-style.ssi.po
+++ b/manual/po/es/project_coding-style.ssi.po
@@ -2,23 +2,21 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-04-07 22:16+0300\n"
-"PO-Revision-Date: 2012-04-07 22:26+0100\n"
-"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
-"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
+"PO-Revision-Date: 2012-08-07 14:06+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
@@ -251,6 +249,9 @@ msgid ""
" bar\n"
" fi\n"
msgstr ""
+" if foo; then\n"
+" bar\n"
+" fi\n"
#. type: Plain text
#: en/project_coding-style.ssi:38 en/project_coding-style.ssi:61
@@ -267,6 +268,10 @@ msgid ""
" bar\n"
" fi\n"
msgstr ""
+" if foo\n"
+" then\n"
+" bar\n"
+" fi\n"
#. type: Plain text
#: en/project_coding-style.ssi:49
@@ -281,6 +286,9 @@ msgid ""
" bar\n"
" }\n"
msgstr ""
+" Foo () {\n"
+" bar\n"
+" }\n"
#. type: Plain text
#: en/project_coding-style.ssi:68
@@ -291,6 +299,10 @@ msgid ""
" bar\n"
" }\n"
msgstr ""
+" Foo ()\n"
+" {\n"
+" bar\n"
+" }\n"
#. type: Plain text
#: en/project_coding-style.ssi:72
@@ -370,13 +382,13 @@ msgstr ""
#: en/project_coding-style.ssi:96
#, no-wrap
msgid " FOO=bar\n"
-msgstr ""
+msgstr " FOO=bar\n"
#. type: Plain text
#: en/project_coding-style.ssi:104
#, no-wrap
msgid " FOO=\"bar\"\n"
-msgstr ""
+msgstr " FOO=\"bar\"\n"
#. type: Plain text
#: en/project_coding-style.ssi:108
@@ -394,6 +406,10 @@ msgid ""
" foobar\n"
" fi\n"
msgstr ""
+" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+" then\n"
+" foobar\n"
+" fi\n"
#. type: Plain text
#: en/project_coding-style.ssi:128
@@ -404,6 +420,10 @@ msgid ""
" foobar\n"
" fi\n"
msgstr ""
+" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+" then\n"
+" foobar\n"
+" fi\n"
#. type: Plain text
#: en/project_coding-style.ssi:132
diff --git a/manual/po/es/project_procedures.ssi.po b/manual/po/es/project_procedures.ssi.po
index f721c5f..5fc6751 100644
--- a/manual/po/es/project_procedures.ssi.po
+++ b/manual/po/es/project_procedures.ssi.po
@@ -2,23 +2,21 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-04-23 20:28+0300\n"
-"PO-Revision-Date: 2012-04-07 18:34+0100\n"
-"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
-"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
+"PO-Revision-Date: 2012-08-07 14:08+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -196,7 +194,7 @@ msgstr ""
#: en/project_procedures.ssi:14
#, no-wrap
msgid " $ ../../scripts/l10n/output-l10n-changes . -d\n"
-msgstr ""
+msgstr " $ ../../scripts/l10n/output-l10n-changes . -d\n"
#. type: Plain text
#: en/project_procedures.ssi:18
@@ -321,6 +319,11 @@ msgid ""
" -e 's|%codename%|lenny|g' \\\n"
" -e 's|%release_mail%|2009/msg00007.html|g'\n"
msgstr ""
+" $ sed \\\n"
+" -e 's|%major%|5.0|g' \\\n"
+" -e 's|%minor%|5.0.2|g' \\\n"
+" -e 's|%codename%|lenny|g' \\\n"
+" -e 's|%release_mail%|2009/msg00007.html|g'\n"
#. type: Plain text
#: en/project_procedures.ssi:63
@@ -335,7 +338,7 @@ msgstr ""
#: en/project_procedures.ssi:67
#, no-wrap
msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
-msgstr ""
+msgstr " Debian Live images for Debian GNU/Linux %major% updated\n"
#. type: Plain text
#: en/project_procedures.ssi:71
@@ -345,18 +348,21 @@ msgid ""
" updated Live images for its stable distribution Debian GNU/Linux %major%\n"
" (codename \"%codename%\").\n"
msgstr ""
+" The Debian Live project is pleased to announce the availability of\n"
+" updated Live images for its stable distribution Debian GNU/Linux %major%\n"
+" (codename \"%codename%\").\n"
#. type: Plain text
#: en/project_procedures.ssi:73
#, no-wrap
msgid " The images are available for download at:\n"
-msgstr ""
+msgstr " The images are available for download at:\n"
#. type: Plain text
#: en/project_procedures.ssi:75
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr ""
+msgstr " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
#. type: Plain text
#: en/project_procedures.ssi:80
@@ -367,28 +373,32 @@ msgid ""
" along with a few adjustments for serious problems. A full list of the\n"
" changes may be viewed at:\n"
msgstr ""
+" This update incorporates the changes made in the %minor% point release,\n"
+" which adds corrections for security problems to the stable release\n"
+" along with a few adjustments for serious problems. A full list of the\n"
+" changes may be viewed at:\n"
#. type: Plain text
#: en/project_procedures.ssi:82
#, no-wrap
msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
-msgstr ""
+msgstr " <http://lists.debian.org/debian-announce/%release_mail%>\n"
#. type: Plain text
#: en/project_procedures.ssi:84
#, no-wrap
msgid " It also includes the following Live-specific changes:\n"
-msgstr ""
+msgstr " It also includes the following Live-specific changes:\n"
#. type: Bullet: ' * '
#: en/project_procedures.ssi:88
msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
-msgstr ""
+msgstr "[INSERT LIVE-SPECIFIC CHANGE HERE]"
#. type: Bullet: ' * '
#: en/project_procedures.ssi:88
msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
-msgstr ""
+msgstr "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
#. type: Plain text
#: en/project_procedures.ssi:92
@@ -397,66 +407,68 @@ msgid ""
" URLs\n"
" ----\n"
msgstr ""
+" URLs\n"
+" ----\n"
#. type: Plain text
#: en/project_procedures.ssi:94
#, no-wrap
msgid " Download location of updated images:\n"
-msgstr ""
+msgstr " Download location of updated images:\n"
#. type: Plain text
#: en/project_procedures.ssi:96
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr ""
+msgstr " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
#. type: Plain text
#: en/project_procedures.ssi:98
#, no-wrap
msgid " Debian Live project homepage:\n"
-msgstr ""
+msgstr " Debian Live project homepage:\n"
#. type: Plain text
#: en/project_procedures.ssi:100
#, no-wrap
msgid " <http://live.debian.net/>\n"
-msgstr ""
+msgstr " <http://live.debian.net/>\n"
#. type: Plain text
#: en/project_procedures.ssi:102
#, no-wrap
msgid " The current stable distribution:\n"
-msgstr ""
+msgstr " The current stable distribution:\n"
#. type: Plain text
#: en/project_procedures.ssi:104
#, no-wrap
msgid " <http://ftp.debian.org/debian/dists/stable>\n"
-msgstr ""
+msgstr " <http://ftp.debian.org/debian/dists/stable>\n"
#. type: Plain text
#: en/project_procedures.ssi:106
#, no-wrap
msgid " stable distribution information (release notes, errata etc.):\n"
-msgstr ""
+msgstr " stable distribution information (release notes, errata etc.):\n"
#. type: Plain text
#: en/project_procedures.ssi:108
#, no-wrap
msgid " <http://www.debian.org/releases/stable/>\n"
-msgstr ""
+msgstr " <http://www.debian.org/releases/stable/>\n"
#. type: Plain text
#: en/project_procedures.ssi:110
#, no-wrap
msgid " Security announcements and information:\n"
-msgstr ""
+msgstr " Security announcements and information:\n"
#. type: Plain text
#: en/project_procedures.ssi:112
#, no-wrap
msgid " <http://www.debian.org/security/>\n"
-msgstr ""
+msgstr " <http://www.debian.org/security/>\n"
#. type: Plain text
#: en/project_procedures.ssi:116
@@ -465,6 +477,8 @@ msgid ""
" About Debian\n"
" -------------\n"
msgstr ""
+" About Debian\n"
+" -------------\n"
#. type: Plain text
#: en/project_procedures.ssi:120
@@ -474,6 +488,9 @@ msgid ""
" volunteer their time and effort in order to produce the completely free\n"
" operating system Debian GNU/Linux.\n"
msgstr ""
+" The Debian Project is an association of Free Software developers who\n"
+" volunteer their time and effort in order to produce the completely free\n"
+" operating system Debian GNU/Linux.\n"
#. type: Plain text
#: en/project_procedures.ssi:124
@@ -482,6 +499,8 @@ msgid ""
" About Debian Live\n"
" -----------------\n"
msgstr ""
+" About Debian Live\n"
+" -----------------\n"
#. type: Plain text
#: en/project_procedures.ssi:129
@@ -492,6 +511,10 @@ msgid ""
" for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
" filesystem images for booting directly from the internet.\n"
msgstr ""
+" Debian Live is an official sub-project of Debian which produces Debian\n"
+" systems that do not require a classical installer. Images are available\n"
+" for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
+" filesystem images for booting directly from the internet.\n"
#. type: Plain text
#: en/project_procedures.ssi:133
@@ -500,6 +523,8 @@ msgid ""
" Contact Information\n"
" -------------------\n"
msgstr ""
+" Contact Information\n"
+" -------------------\n"
#. type: Plain text
#: en/project_procedures.ssi:137
@@ -509,3 +534,6 @@ msgid ""
" <http://live.debian.net/> or alternatively send mail to\n"
" <debian-live at lists.debian.org>.\n"
msgstr ""
+" For further information, please visit the Debian Live web pages at\n"
+" <http://live.debian.net/> or alternatively send mail to\n"
+" <debian-live at lists.debian.org>.\n"
diff --git a/manual/po/es/style_guide.ssi.po b/manual/po/es/style_guide.ssi.po
index 428af2e..fa9eff4 100644
--- a/manual/po/es/style_guide.ssi.po
+++ b/manual/po/es/style_guide.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 17:04+0300\n"
+"POT-Creation-Date: 2012-07-31 23:27+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -24,7 +24,7 @@ msgstr ":B~ Apéndice"
#: 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
@@ -50,33 +50,35 @@ msgstr ":B~ Apéndice"
#: 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: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: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:218
+#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
#: 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:350
+#: en/user_customization-packages.ssi:358 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: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_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
@@ -94,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
@@ -119,34 +121,36 @@ msgstr "code{"
#: 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:206
+#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:363 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: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_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
@@ -799,41 +803,21 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:220
msgid ""
-"Some translators decide to include the code blocks in the translated files "
-"because it is easier for them to identify what has already been translated "
-"and what has not by looking at the percentages if they use a graphical "
-"translation program."
+"Even though the code blocks are usually untranslatable, including them in "
+"the translation is the only way to score a 100% complete translation. And "
+"even though it means more work at first because it requires the intervention "
+"of the translators if the code changes, it is the best way, in the long run, "
+"to identify what has already been translated and what has not when checking "
+"the integrity of the .po files."
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:222
-msgid ""
-"Include the code blocks if you want to score a 100% complete translation."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:224
-msgid ""
-"On the other hand some translators prefer to leave the code blocks "
-"\"untranslated\" (i.e. not including them). This makes the translation "
-"easier to maintain once finished because it does not require translators "
-"intervention if the code changes."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:226
-msgid ""
-"Leave the code blocks empty (they will be automatically added then) if you "
-"want to make your translation easier to maintain."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:228
msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:230
+#: en/style_guide.ssi:224
msgid ""
"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
@@ -842,48 +826,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:232
+#: en/style_guide.ssi:226
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:234
+#: en/style_guide.ssi:228
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:236
+#: en/style_guide.ssi:230
msgid "Translators should never translate:"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:238
+#: en/style_guide.ssi:232
msgid "The code names of releases"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:240
+#: en/style_guide.ssi:234
msgid "The names of programs"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:242
+#: en/style_guide.ssi:236
msgid "The commands given as examples"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:244
+#: en/style_guide.ssi:238
msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:246
+#: en/style_guide.ssi:240
msgid "Links"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:247
+#: en/style_guide.ssi:241
msgid "Paths"
msgstr ""
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index a9cea2e..bb09b18 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.ssi.po
@@ -2,23 +2,21 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-07-18 19:47+0300\n"
-"PO-Revision-Date: 2012-02-19 21:41+0100\n"
-"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
-"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
+"PO-Revision-Date: 2012-08-07 14:21+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -349,7 +347,7 @@ msgstr ""
#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
-msgstr ""
+msgstr " $ lb config\n"
#. type: Plain text
#: en/user_basics.ssi:38
@@ -425,13 +423,13 @@ msgstr ""
#: en/user_basics.ssi:60
#, no-wrap
msgid " # apt-get install wodim\n"
-msgstr ""
+msgstr " # apt-get install wodim\n"
#. type: Plain text
#: en/user_basics.ssi:62
#, no-wrap
msgid " $ wodim binary.hybrid.iso\n"
-msgstr ""
+msgstr " $ wodim binary.hybrid.iso\n"
#. type: Plain text
#: en/user_basics.ssi:66
@@ -478,7 +476,7 @@ msgstr ""
#: en/user_basics.ssi:75
#, no-wrap
msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
-msgstr ""
+msgstr " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
#. type: Plain text
#: en/user_basics.ssi:80
@@ -637,7 +635,7 @@ msgstr ""
#: en/user_basics.ssi:110
#, no-wrap
msgid " # apt-get install qemu-kvm qemu-utils\n"
-msgstr ""
+msgstr " # apt-get install qemu-kvm qemu-utils\n"
#. type: Plain text
#: en/user_basics.ssi:114
@@ -648,7 +646,7 @@ msgstr "Arrancar una imagen ISO es sencillo:"
#: en/user_basics.ssi:118
#, no-wrap
msgid " $ kvm -cdrom binary.hybrid.iso\n"
-msgstr ""
+msgstr " $ kvm -cdrom binary.hybrid.iso\n"
#. type: Plain text
#: en/user_basics.ssi:122
@@ -670,13 +668,13 @@ msgstr "Para probar una imagen ISO con /{virtualbox-ose}/:"
#: en/user_basics.ssi:130
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
-msgstr ""
+msgstr " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
#. type: Plain text
#: en/user_basics.ssi:132
#, no-wrap
msgid " $ virtualbox\n"
-msgstr ""
+msgstr " $ virtualbox\n"
#. type: Plain text
#: en/user_basics.ssi:136
@@ -698,7 +696,7 @@ msgstr "*{Nota:}* Para probar los sistemas en vivo con soporte X.org en /{virtua
#: en/user_basics.ssi:142
#, no-wrap
msgid " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
-msgstr ""
+msgstr " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
#. type: Plain text
#: en/user_basics.ssi:146
@@ -737,7 +735,7 @@ msgstr "*{Nota:}* si se ha creado una imagen ISO híbrida con el ejemplo anterio
#: en/user_basics.ssi:154 en/user_basics.ssi:220
#, no-wrap
msgid " # lb clean --binary\n"
-msgstr ""
+msgstr " # lb clean --binary\n"
#. type: Plain text
#: en/user_basics.ssi:158
@@ -752,7 +750,7 @@ msgstr ""
#: en/user_basics.ssi:162
#, no-wrap
msgid " $ lb config -b hdd\n"
-msgstr ""
+msgstr " $ lb config -b hdd\n"
#. type: Plain text
#: en/user_basics.ssi:166 en/user_basics.ssi:234
@@ -811,7 +809,7 @@ msgstr ""
#: en/user_basics.ssi:186
#, no-wrap
msgid " $ kvm -hda binary.img\n"
-msgstr ""
+msgstr " $ kvm -hda binary.img\n"
#. type: Plain text
#: en/user_basics.ssi:190
@@ -835,7 +833,7 @@ msgstr ""
#: en/user_basics.ssi:196
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
-msgstr ""
+msgstr " # gparted ${USBSTICK}\n"
#. type: Plain text
#: en/user_basics.ssi:200
@@ -852,7 +850,7 @@ msgstr ""
#: en/user_basics.ssi:204
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
-msgstr ""
+msgstr " # mkfs.ext4 ${PARTITION}\n"
#. type: Plain text
#: en/user_basics.ssi:208
@@ -901,7 +899,7 @@ msgstr ""
#: en/user_basics.ssi:228
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
-msgstr ""
+msgstr " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
#. type: Plain text
#: en/user_basics.ssi:232
@@ -997,7 +995,7 @@ msgstr " # /etc/dhcp/dhcpd.conf - fichero de configuración para isc-dhcp-server
#: en/user_basics.ssi:258
#, no-wrap
msgid " ddns-update-style none;\n"
-msgstr ""
+msgstr " ddns-update-style none;\n"
#. type: Plain text
#: en/user_basics.ssi:261
@@ -1006,6 +1004,8 @@ msgid ""
" option domain-name \"example.org\";\n"
" option domain-name-servers ns1.example.org, ns2.example.org;\n"
msgstr ""
+" option domain-name \"example.org\";\n"
+" option domain-name-servers ns1.example.org, ns2.example.org;\n"
#. type: Plain text
#: en/user_basics.ssi:264
@@ -1014,12 +1014,14 @@ msgid ""
" default-lease-time 600;\n"
" max-lease-time 7200;\n"
msgstr ""
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
#. type: Plain text
#: en/user_basics.ssi:266
#, no-wrap
msgid " log-facility local7;\n"
-msgstr ""
+msgstr " log-facility local7;\n"
#. type: Plain text
#: en/user_basics.ssi:272
@@ -1031,6 +1033,11 @@ msgid ""
" filename \"pxelinux.0\";\n"
"}\n"
msgstr ""
+" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+" range 192.168.0.1 192.168.0.254;\n"
+" next-server servername;\n"
+" filename \"pxelinux.0\";\n"
+"}\n"
#. type: Plain text
#: en/user_basics.ssi:276
@@ -1061,7 +1068,7 @@ msgstr ""
#: en/user_basics.ssi:284
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
-msgstr ""
+msgstr " # dpkg-reconfigure -plow tftpd-hpa\n"
#. type: Plain text
#: en/user_basics.ssi:288
@@ -1103,7 +1110,7 @@ msgstr ""
#: en/user_basics.ssi:300
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
-msgstr ""
+msgstr " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
#. type: Plain text
#: en/user_basics.ssi:304
@@ -1117,7 +1124,7 @@ msgstr ""
#: en/user_basics.ssi:308
#, no-wrap
msgid " # exportfs -rv\n"
-msgstr ""
+msgstr " # exportfs -rv\n"
#. type: Plain text
#: en/user_basics.ssi:312
@@ -1188,6 +1195,14 @@ msgid ""
" sudo /usr/sbin/brctl addif br0 $1\n"
" sleep 2\n"
msgstr ""
+" #!/bin/sh\n"
+" sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
+" echo \"Executing /etc/qemu-ifup\"\n"
+" echo \"Bringing up $1 for bridged mode...\"\n"
+" sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
+" echo \"Adding $1 to br0...\"\n"
+" sudo /usr/sbin/brctl addif br0 $1\n"
+" sleep 2\n"
#. type: Plain text
#: en/user_basics.ssi:339
@@ -1235,6 +1250,11 @@ msgid ""
" memsize = \"512\"\n"
" MemAllowAutoScaleDown = \"FALSE\"\n"
msgstr ""
+" #!/usr/bin/vmware\n"
+" config.version = \"8\"\n"
+" virtualHW.version = \"4\"\n"
+" memsize = \"512\"\n"
+" MemAllowAutoScaleDown = \"FALSE\"\n"
#. type: Plain text
#: en/user_basics.ssi:363
@@ -1246,6 +1266,11 @@ msgid ""
" sound.present = \"FALSE\"\n"
" tools.remindInstall = \"FALSE\"\n"
msgstr ""
+" #!/usr/bin/vmware\n"
+" config.version = \"8\"\n"
+" virtualHW.version = \"4\"\n"
+" memsize = \"512\"\n"
+" MemAllowAutoScaleDown = \"FALSE\"\n"
#. type: Plain text
#: en/user_basics.ssi:366
@@ -1254,6 +1279,8 @@ msgid ""
" ethernet0.present = \"TRUE\"\n"
" ethernet0.addressType = \"generated\"\n"
msgstr ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
#. type: Plain text
#: en/user_basics.ssi:369
@@ -1262,6 +1289,8 @@ msgid ""
" displayName = \"Test Boot PXE\"\n"
" guestOS = \"other\"\n"
msgstr ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
#. type: Plain text
#: en/user_basics.ssi:374
@@ -1272,6 +1301,10 @@ msgid ""
" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
" ethernet0.generatedAddressOffset = \"0\"\n"
msgstr ""
+" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
+" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" ethernet0.generatedAddressOffset = \"0\"\n"
#. type: Plain text
#: en/user_basics.ssi:378
diff --git a/manual/po/es/user_customization-binary.ssi.po b/manual/po/es/user_customization-binary.ssi.po
index 7c6b8a2..d8760bd 100644
--- a/manual/po/es/user_customization-binary.ssi.po
+++ b/manual/po/es/user_customization-binary.ssi.po
@@ -2,23 +2,21 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-04-08 12:15+0300\n"
-"PO-Revision-Date: 2012-02-24 16:54+0100\n"
-"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
-"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
+"PO-Revision-Date: 2012-08-07 14:22+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
@@ -221,7 +219,7 @@ msgstr ""
#: en/user_customization-binary.ssi:16
#, no-wrap
msgid " $ lb config --mode progress --syslinux-theme progress-server\n"
-msgstr ""
+msgstr " $ lb config --mode progress --syslinux-theme progress-server\n"
#. type: Plain text
#: en/user_customization-binary.ssi:20
@@ -277,6 +275,10 @@ msgid ""
" prompt 0\n"
" timeout 50\n"
msgstr ""
+" include menu.cfg\n"
+" default vesamenu.c32\n"
+" prompt 0\n"
+" timeout 50\n"
#. type: Plain text
#: en/user_customization-binary.ssi:37
@@ -299,7 +301,7 @@ msgstr " #!/bin/sh\n"
#: en/user_customization-binary.ssi:43
#, no-wrap
msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
-msgstr ""
+msgstr " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
#. type: Plain text
#: en/user_customization-binary.ssi:47
diff --git a/manual/po/es/user_customization-contents.ssi.po b/manual/po/es/user_customization-contents.ssi.po
index b96bb25..9ff3219 100644
--- a/manual/po/es/user_customization-contents.ssi.po
+++ b/manual/po/es/user_customization-contents.ssi.po
@@ -1,27 +1,26 @@
# Spanish translations for live-manual package
# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+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"
-"Language-Team: none\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
+"PO-Revision-Date: 2012-08-08 22:58+0100\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi: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"
@@ -199,14 +199,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 ""
"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 "
+"cualquier fichero en la imagen Debian Live a crear. live-build tiene dos "
"mecanismos:"
#. type: Plain text
@@ -234,18 +234,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 +241,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 +267,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,20 +281,22 @@ 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"
" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ 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 "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"
@@ -318,9 +308,17 @@ msgid ""
" [...]\n"
" `-- templates\n"
msgstr ""
+" -- config\n"
+" [...]\n"
+" |-- includes.chroot\n"
+" | `-- var\n"
+" | `-- www\n"
+" | `-- index.html\n"
+" [...]\n"
+" `-- 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."
@@ -330,12 +328,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 +356,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 ""
+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 ""
"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 +383,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 +412,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-"
@@ -470,16 +435,16 @@ msgstr ""
"pueden verse en #{/lib/live/config/}# y fijarse en la secuencia de números. "
"Cuando se vaya a utilizar scripts propios deben ser prefijados con un número "
"para indicar el orden de ejecución. Otra posibilidad es utilizar un paquete "
-"personalizado tal y como se describe en {Instalar paquetes de terceros o "
-"paquetes modificados}#installing-modified-or-third-party-packages."
+"personalizado tal y como se describe en {Instalar paquetes modificados o de "
+"terceros}#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 +470,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 +488,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-installer.ssi.po b/manual/po/es/user_customization-installer.ssi.po
index 3830477..ad53778 100644
--- a/manual/po/es/user_customization-installer.ssi.po
+++ b/manual/po/es/user_customization-installer.ssi.po
@@ -2,22 +2,21 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-06-03 19:00+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"
-"Language-Team: none\n"
+"PO-Revision-Date: 2012-08-07 14:22+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"X-Poedit-Language: Spanish\n"
"X-Poedit-Country: SPAIN\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -305,6 +304,9 @@ msgid ""
" --debian-installer live\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
+" --debian-installer live\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
#. type: Plain text
#: en/user_customization-installer.ssi:40
@@ -343,6 +345,8 @@ msgid ""
" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
" >> config/binary_debian-installer/preseed.cfg\n"
msgstr ""
+" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
+" >> config/binary_debian-installer/preseed.cfg\n"
#. type: Plain text
#: en/user_customization-installer.ssi:51
diff --git a/manual/po/es/user_customization-overview.ssi.po b/manual/po/es/user_customization-overview.ssi.po
index 345c539..bb41500 100644
--- a/manual/po/es/user_customization-overview.ssi.po
+++ b/manual/po/es/user_customization-overview.ssi.po
@@ -2,8 +2,8 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 9e2bffd..92cac14 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -1,32 +1,27 @@
-# Spanish translations for live-manual package
+# Spanish translations for live-manual
# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011
+# Carlos Zuferri <chals at altorricon.com>, 2011,2012, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 22:45+0300\n"
-"PO-Revision-Date: 2012-07-09 22:57+0100\n"
-"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
-"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"POT-Creation-Date: 2012-08-10 22:48+0300\n"
+"PO-Revision-Date: 2012-08-08 22:57+0100\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Spanish\n"
-"X-Poedit-Country: SPAIN\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: 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 +38,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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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 +92,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,51 +109,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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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,10 +182,10 @@ msgid ""
"areas. To ensure decent download speeds, you should choose a nearby "
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
-"can define your own lists of packages to include, use live-build's "
-"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
-"Finally, a number of options give some control over /{apt}/, or if you "
-"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"can define lists of packages, including metapackages which will install many "
+"related packages at once, such as packages for a particular desktop or "
+"language. Finally, a number of options give some control over /{apt}/, or if "
+"you prefer, /{aptitude}/, at build time when packages are installed. You may "
"find these handy if you use a proxy, want to disable installation of "
"recommended packages to save space, or need to control which versions of "
"packages are installed via APT pinning, to name a few possibilities."
@@ -203,15 +200,15 @@ msgstr ""
"velocidad de descarga de paquetes, se debería elegir el repositorio Debian "
"más cercano. Se pueden añadir repositorios para backports, experimentales, "
"paquetes personalizados o incluir ficheros de paquetes directamente. Se "
-"pueden definir listas de paquetes personalizadas, utilizar listas "
-"predefinidas en live-build, seleccionar tareas de /{tasksel}/ o una "
-"combinación de los tres métodos. Por último existen varias opciones que dan "
-"algún control sobre cuando son instalados los paquetes por la herramienta /"
-"{apt}/ o la herramienta /{aptitude}/, según sea la elegida. Estas opciones "
-"pueden ser útiles si se utiliza un proxy, se quiere desactivar la "
-"instalación de paquetes recomendados para ahorrar espacio o se necesita "
-"controlar las versiones de los paquetes a instalar mediante APT pinning, por "
-"nombrar algunas posibilidades."
+"pueden definir listas de paquetes personalizadas, incluyendo metapaquetes "
+"que instalarán muchos paquetes relacionados, como por ejemplo paquetes de un "
+"entorno de escritorio o lenguaje particular. Por último existen varias "
+"opciones que dan algún control sobre cuando son instalados los paquetes por "
+"la herramienta /{apt}/ o la herramienta /{aptitude}/, según sea la elegida. "
+"Estas opciones pueden ser útiles si se utiliza un proxy, se quiere "
+"desactivar la instalación de paquetes recomendados para ahorrar espacio o se "
+"necesita controlar las versiones de los paquetes a instalar mediante APT "
+"pinning, por nombrar algunas posibilidades."
#. type: Plain text
#: en/user_customization-packages.ssi:8
@@ -248,10 +245,10 @@ 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 ""
+msgstr " $ lb config --distribution sid\n"
#. type: Plain text
#: en/user_customization-packages.ssi:20
@@ -272,7 +269,7 @@ msgstr ""
#: en/user_customization-packages.ssi:24
#, no-wrap
msgid " $ lb config --archive-areas \"main contrib\"\n"
-msgstr ""
+msgstr " $ lb config --archive-areas \"main contrib\"\n"
#. type: Plain text
#: en/user_customization-packages.ssi:28
@@ -361,6 +358,9 @@ msgid ""
" --mirror-chroot-security http://localhost/debian-security/ \\\n"
"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
#. type: Plain text
#: en/user_customization-packages.ssi:48
@@ -405,6 +405,8 @@ msgid ""
" $ lb config --mirror-binary http://mirror/debian/ \\\n"
" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
#. type: Plain text
#: en/user_customization-packages.ssi:61
@@ -447,7 +449,7 @@ msgstr ""
#: en/user_customization-packages.ssi:69
#, no-wrap
msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
-msgstr ""
+msgstr " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
#. type: Plain text
#: en/user_customization-packages.ssi:73
@@ -481,7 +483,7 @@ msgid "*{Note:}* some preconfigured package repositories are available for easy
msgstr "*{Nota:}* Existen algunos repositorios de paquetes ya preconfigurados para facilitar la selección mediante la opción #{--archives}#. Por ejemplo, para utilizar las instantáneas del repositorio de Debian Live, sería suficiente con activarlo mediante:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
msgstr " $ lb config --archives live.debian.net\n"
@@ -496,19 +498,20 @@ msgstr "2~choosing-packages-to-install Selección de los paquetes a instalar"
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"individual packages to install in a package list. You can also choose "
-"predefined lists of packages, or use APT tasks. And finally, you may place "
-"package files in your #{config/}# tree, which is well suited to testing of "
-"new or experimental packages before they are available from a repository."
+"individual packages to install in a package list. You can also use "
+"metapackages in those lists, or select them using package control file "
+"fields. And finally, you may place package files in your #{config/}# tree, "
+"which is well suited to testing of new or experimental packages before they "
+"are available from a repository."
msgstr ""
"Hay varias maneras de seleccionar qué paquetes serán instalados por live-"
"build en la imagen que cubren una variedad de necesidades diversas. Se puede "
"nombrar paquetes individuales para instalar en una lista de paquetes. "
-"También se puede seleccionar listas de paquetes predefinidos o incluso "
-"utilizar tareas de APT. Por último, también se pueden utilizar ficheros de "
-"paquetes de prueba o experimentales obtenidos antes de que aparezcan en los "
-"repositorios oficiales simplemente depositando estos ficheros directamente "
-"en el árbol de directorios #{config/}#."
+"También se puede utilizar metapaquetes en esas listas, o selecionarlas "
+"utilizando campos de ficheros de control de paquetes. Por último, también se "
+"pueden utilizar ficheros de paquetes de prueba o experimentales obtenidos "
+"antes de que aparezcan en los repositorios oficiales simplemente depositando "
+"estos ficheros directamente en el árbol de directorios #{config/}#."
#. type: Plain text
#: en/user_customization-packages.ssi:91
@@ -521,21 +524,15 @@ msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
"which makes it easy to build lists from other lists and adapt them for use "
-"in multiple configurations. You can use predefined package lists, providing "
-"in a modular fashion package selections from each of the major desktop "
-"environments and some special purpose lists, as well as standard lists the "
-"others are based upon. You can also provide your own package lists, or use a "
-"combination of both."
+"in multiple configurations. Package names may also be injected into the list "
+"using shell helpers at build time."
msgstr ""
"Las listas de paquetes proporcionan una potente forma de expresar qué "
-"paquetes deberían ser instalados. La sintaxis de la lista soporta la "
+"paquetes deberían ser instalados. La sintaxis de la listas soporta la "
"inclusión de ficheros y secciones condicionales, que facilitan la creación "
"de listas a partir de otras listas, adaptando su utilización a diversas "
-"configuraciones. También pueden utilizarse listas de paquetes predefinidas, "
-"dando una manera modular a la selección de paquetes para cada uno de los "
-"diferentes entornos de escritorios y algunas listas de propósito especial "
-"basadas en otras listas de propósito general. Puede utilizarse listas "
-"propias o una combinación de listas propias y listas predefinidas."
+"configuraciones. También se pueden añadir nombre de paquetes en la listas "
+"utilizando shell helpers en tiempo de construcción. "
#. type: Plain text
#: en/user_customization-packages.ssi:95
@@ -545,55 +542,120 @@ msgstr "*{Nota:}* El comportamiento de live-build cuando se especifica un paquet
#. type: Plain text
#: en/user_customization-packages.ssi:97
-msgid "3~ Predefined package lists"
-msgstr "3~ Listas de paquetes predefinidas"
+#, fuzzy
+#| msgid "3~ Using metapackages"
+msgid "3~using-metapackages Using metapackages"
+msgstr "3~ Utilizar metapaquetes"
#. type: Plain text
#: en/user_customization-packages.ssi:99
msgid ""
-"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--package-lists}# option. For example:"
+"The simplest way to populate your package list is to use a task metapackage "
+"maintained by your distribution. For example:"
msgstr ""
-"La forma más simple de utilizar listas de paquetes es especificar una o más "
-"listas predefinidas mediante la opción #{--package-lists}#, por ejemplo:"
+"La manera más sencilla de rellenar una lista de paquetes es utilizar una "
+"tarea metapaquete mantenida por una distribución. Por ejemplo:"
#. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:104
#, no-wrap
-msgid " $ lb config --package-lists \"gnome rescue\"\n"
+msgid ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
+msgstr ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:108
+msgid ""
+"This supercedes the older predefined list method supported in #{live-build}# "
+"2.x. Unlike predefined lists, task metapackages are not specific to the "
+"Debian Live project. Instead, they are maintained by specialist working "
+"groups within the distribution and therefore reflect the consensus of each "
+"group about which packages best serve the needs of the intended users. They "
+"also cover a much broader range of use cases than the predefined lists they "
+"replace."
+msgstr ""
+"Esto reemplaza el antiguo método de listas predefinidas compatible con #"
+"{live-build}# 2.x. A diferencia de las listas predefinidas, los metapaquetes "
+"de tareas no son específicos del proyecto Debian Live. Por el contrario, son "
+"mantenidas por grupos de especialistas que trabajan en la distribución y por "
+"lo tanto, reflejan el consenso de cada grupo acerca de qué paquetes sirven "
+"mejor a las necesidades de los usuarios. Además, abarcan una gama mucho más "
+"amplia de casos de uso que las listas predefinidas a las que sustituyen."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:110
+msgid ""
+"All task metapackages are prefixed #{task-}#, so a quick way to determine "
+"which are available (though it may contain a handful of false hits that "
+"match the name but aren't metapackages) is to match on the package name with:"
msgstr ""
+"Todos los metapaquetes de tareas tienen el prefijo #{task-}#, por lo que "
+"una forma rápida de determinar cuales están disponibles (aunque puede "
+"contener un puñado de entradas falsas que coincidan con el nombre, pero que "
+"no son metapaquetes) es buscar el nombre del paquete con:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:114
+#, no-wrap
+msgid " $ apt-cache search --names-only ^task-\n"
+msgstr " $ apt-cache search --names-only ^task-\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:118
msgid ""
-"The default location for the list files on your system is #{/usr/share/live/"
-"build/package-lists/}#. To determine the packages in a given list, read the "
-"corresponding file, paying attention to included files and conditionals as "
-"described in the following sections."
+"In addition to these, you will find other metapackages with various "
+"purposes. Some are subsets of broader task packages, like #{gnome-core}#, "
+"while others are individual specialized parts of a Debian Pure Blend, such "
+"as the #{education-*}# metapackages. To list all metapackages in the "
+"archive, install the #{debtags}# package and list all packages with the #"
+"{role::metapackage}# tag as follows:"
msgstr ""
-"La ubicación por defecto de las listas de los ficheros en el sistema huésped "
-"es #{/usr/share/live/build/package-lists/}#. Para determinar qué paquetes "
-"componen una lista dada se debe leer el correspondiente fichero poniendo "
-"atención en los ficheros incluidos y en las secciones condicionales como se "
-"describen a continuación."
+"Además de éstos, se encuentran otros metapaquetes con diversos fines. "
+"Algunos son subconjuntos de paquetes de tareas más amplias, como #{gnome-"
+"core}#, mientras que otros son partes especializadas individuales de un "
+"Debian Pure Blend, como los metapaquetes #{education-*}#. Para tener una "
+"lista de todos los metapaquetes en el archivo, instalar el paquete #{debtags}"
+"# y listar todos los paquetes con la etiqueta #{role::metapackage}# de la "
+"siguiente manera:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:122
+#, no-wrap
+msgid " $ debtags search role::metapackage\n"
+msgstr " $ debtags search role::metapackage\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr "3~ Listas de paquetes locales"
#. type: Plain text
-#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:128
msgid ""
-"You may supplement the predefined lists using local package lists stored in #"
-"{config/package-lists/}#."
+"Whether you list metapackages, individual packages, or a combination of "
+"both, all local package lists are stored in #{config/package-lists/}#. Since "
+"more than one list can be used, this lends itself well to modular designs. "
+"For example, you may decide to devote one list to a particular choice of "
+"desktop, another to a collection of related packages that might as easily be "
+"used on top of a different desktop. This allows you to experiment with "
+"different combinations of sets of packages with a minimum of fuss, sharing "
+"common lists between different live image projects."
msgstr ""
-"Se pueden añadir o reemplazar completamente las listas predefinidas "
-"depositando listas de paquetes locales en el directorio #{config/package-"
-"lists/}#."
+"Ya sea incluyendo metapaquetes en una lista, paquetes individuales, o una "
+"combinación de ambos, todas las listas de paquetes locales se deben "
+"almacenar en #{config/package-lists/}#. Ya que se puede utilizar más de una "
+"lista, esto se presta muy bien a los diseños modulares. Por ejemplo, se "
+"puede dedicar una lista a una elección particular de escritorio, la otra a "
+"una colección de paquetes relacionados que puedan ser fácilmente utilizados "
+"sobre un escritorio diferente. Esto permite experimentar con diferentes "
+"combinaciones de conjuntos de paquetes con un mínimo esfuerzo, así como "
+"compartir listas comunes entre diferentes proyectos de imágenes en vivo."
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -605,18 +667,18 @@ msgstr ""
"lista."
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:132
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr "*{Nota:}* Si no se especifica el sufijo, la lista será usada en las dos etapas. En consecuencia, es conveniente especificar #{.list.chroot}# de modo que los paquetes se instalen únicamente en el sistema en vivo y no exista otra copia extra del paquete #{.deb}#.\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:134
msgid "3~ Local binary package lists"
msgstr "3~ Listas de paquetes locales para binary"
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:136
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -634,49 +696,59 @@ msgstr ""
"el sufijo #{.list}#"
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "3~ Extending a provided package list using includes"
-msgstr "3~ Extensión de una lista de paquetes dada mediante «includes»"
+#: en/user_customization-packages.ssi:138
+msgid "3~generated-package-lists Generated package lists"
+msgstr "3~generated-package-lists Generar listas de paquetes"
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:140
msgid ""
-"The package lists that are included with live-build make extensive use of "
-"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
-"directory, as they serve as good examples of how to write your own 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 "
+"command to be executed within the chroot when the image is built. For "
+"example, one might include the line #{! grep-aptavail -n -sPackage -"
+"FPriority standard | sort}# in a package list to produce a sorted list of "
+"available packages with #{Priority: standard}#."
msgstr ""
-"Las listas de paquetes predefinidas en live-build hacen un uso intensivo de "
-"las directivas «includes». Los ficheros existentes en el directorio #{/usr/"
-"share/live/build/package-lists/}# pueden servir como buen ejemplo de como "
-"escribir listas de paquetes."
+"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 "
+"comando que se ejecutará dentro del chroot cuando la imagen se construya. "
+"Por ejemplo, se podría incluir la línea #{! grep-aptavail -n -sPackage -"
+"FPriority standard | sort}# en una lista de paquetes para producir una lista "
+"ordenada de los paquetes disponibles con #{Priority: standard}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:142
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list "
-"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
-"following contents:"
+"In fact, selecting packages with the #{grep-aptavail}# command (from the #"
+"{dctrl-tools}# package) is so useful that #{live-build}# provides a #"
+"{Packages}# helper script as a convenience. This script takes two arguments: "
+"#{field}# and #{pattern}#. Thus, you can create a list with the following "
+"contents:"
msgstr ""
-"Por ejemplo, para hacer una lista de paquetes que incluya la lista de "
-"paquetes predefinida #{gnome}# y añadir el paquete /{iceweasel}/ se puede "
-"crear un fichero llamado #{config/package-lists/my.list.chroot}# con el "
-"siguiente contenido:"
+"De hecho, la selección de paquetes con la orden #{grep-aptavail}# (del "
+"paquete #{dctrl-tools}#) es tan útil que #{live-build}# proporciona un "
+"script de ayuda llamado #{Packages}#. Este script acepta dos argumentos: #"
+"{field}# y #{pattern}#. Por lo tanto, se puede crear una lista con los "
+"siguientes contenidos:"
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
-" #include <gnome>\n"
-" iceweasel\n"
+" $ lb config\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
msgstr ""
+" $ lb config\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr "3~ Utilización de condiciones dentro de las listas de paquetes"
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -695,7 +767,7 @@ msgstr ""
"{ARCHIVE_AREAS}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
@@ -704,16 +776,19 @@ msgstr ""
"arquitectura amd64 (#{--architectures amd64}#) se puede utilizar:"
#. type: Plain text
-#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
" ia32-libs\n"
" #endif\n"
msgstr ""
+" #if ARCHITECTURES amd64\n"
+" ia32-libs\n"
+" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:165
msgid ""
"You may test for any one of a number of values, e.g. to install /"
"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
@@ -725,16 +800,19 @@ msgstr ""
"especificar:"
#. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURES i386 amd64\n"
" memtest86+\n"
" #endif\n"
msgstr ""
+" #if ARCHITECTURES i386 amd64\n"
+" memtest86+\n"
+" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:175
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
@@ -746,21 +824,24 @@ msgstr ""
"archive-areas}# se puede indicar:"
#. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
" vrms\n"
" #endif\n"
msgstr ""
+" #if ARCHIVE_AREAS contrib non-free\n"
+" vrms\n"
+" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr "Es habitual que una condición incluya una directiva «include»:"
#. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
@@ -772,63 +853,17 @@ msgstr ""
" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr "No se permite el anidamiento de estructuras condicionales."
#. type: Plain text
-#: en/user_customization-packages.ssi:180
-msgid "3~ Tasks"
-msgstr "3~ Tareas"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid ""
-"The Debian Installer offers the user choices of a number of preselected "
-"lists of packages, each one focused on a particular kind of system, or task "
-"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
-"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
-"by APT through the \"Task:\" field. You can specify one or more tasks in "
-"live-build by putting them in a list in #{config/task-lists/}#, as in the "
-"example below."
-msgstr ""
-"El Instalador de Debian ofrece al usuario un conjunto de opciones con una "
-"lista de paquetes preseleccionada enfocadas a configurar un tipo de sistema "
-"o configurar el sistema para realizar una tarea como puede ser «Entorno de "
-"escritorio gráfico», «Servidor de correo», «Portátil», etc. Estas listas son "
-"llamadas «tareas» (\"Tasks\") y son soportadas por APT mediante el campo "
-"«Task:». Se puede especificar una o más tareas a live-build poniéndolas en "
-"una lista en #{config/task-lists/}#, como en el ejemplo siguiente."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:187
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:191
-msgid ""
-"The primary tasks available in the Debian Installer can be listed with #"
-"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including the ones not included in this list, may be examined with #{tasksel "
-"--task-packages}#."
-msgstr ""
-"Una vez ha sido arrancado el sistema en vivo puede conocerse qué tareas "
-"primarias están disponibles en el Instalador de Debian mediante la orden #"
-"{tasksel --list-tasks}#. La lista de paquetes contenidos en cualquier tarea "
-"(incluidas aquellas que no aparecen en la lista de tareas primarias) puede "
-"obtenerse mediante la orden #{tasksel --task-packages}#."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:197
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr "3~desktop-and-language-tasks Tareas de Escritorio e Idioma"
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:199
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -852,7 +887,7 @@ msgstr ""
"correspondientes tareas del idioma."
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:201
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -870,13 +905,20 @@ msgstr ""
"comportamiento por defecto de live-build."
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:203
+#, fuzzy
+#| msgid ""
+#| "Because there is no provision made automatically for language tasks, "
+#| "which include such things as language-specific fonts and input-method "
+#| "packages, if you want them, you need to specify them in your "
+#| "configuration. For example, a GNOME desktop image containing support for "
+#| "Japanese might include these tasks:"
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
"you want them, you need to specify them in your configuration. For example, "
"a GNOME desktop image containing support for Japanese might include these "
-"tasks:"
+"task metapackages:"
msgstr ""
"Ya que no se ha previsto la instalación automática de tareas de idiomas, que "
"incluyen cosas tales como tipos de letra específicos de cada lengua o "
@@ -886,56 +928,32 @@ msgstr ""
"tareas:"
#. type: Plain text
-#: en/user_customization-packages.ssi:205
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
-" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:209
-msgid ""
-"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value, if it differs from the "
-"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
-"variable or else tasksel will not recognize and install it. Thus:"
-msgstr ""
-"Ya que las tareas de escritorio son \"internas\", para cada tarea de sabor "
-"de escritorio incluido en la imagen, el valor correspondiente (si es "
-"diferente del predeterminado \"gnome\"), tiene que ser preconfigurado en la "
-"variable \"tasksel/desktop\" de lo contrario tasksel no lo va a reconocer e "
-"instalar. Por lo tanto:"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:214
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ lb config\n"
+#| " $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+#| " $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
msgid ""
" $ lb config\n"
-" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:218
-msgid ""
-"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
-"\"."
+" $ echo \"task-gnome-desktop task-laptop\" >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-japanese task-japanese-desktop task-japanese-gnome-desktop\" >> config/package-lists/my.list.chroot\n"
msgstr ""
-"Este parámetro puede tener varios valores, por ejemplo, \"lxde xfce\" en "
-"lugar de \"kde\"."
+" $ lb config\n"
+" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:213
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
-"2~installing-modified-or-third-party-packages Instalar paquetes de terceros "
-"o paquetes modificados"
+"2~installing-modified-or-third-party-packages Instalar paquetes modificados "
+"o de terceros"
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:215
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -953,7 +971,7 @@ msgstr ""
"paquetes «de terceros» para añadir funcionalidades a medida o propietarias."
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:217
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -970,22 +988,22 @@ msgstr ""
"la creación de paquetes a medida."
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:219
msgid "There are two ways of installing modified custom packages:"
msgstr "Existen dos formas de instalar paquetes personalizados:"
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:221
msgid "_* #{packages.chroot}#"
msgstr "_* #{packages.chroot}#"
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:223
msgid "_* Using a custom APT repository"
msgstr "_* Utilizando un repositorio APT personalizado"
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:225
msgid ""
"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
"customizations but has a number of drawbacks, whilst using a custom APT "
@@ -997,12 +1015,12 @@ msgstr ""
"repositorio APT personalizado es más lento de poner en marcha."
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:227
msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr "3~ Método #{packages.chroot}# para instalar paquetes personalizados"
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:229
msgid ""
"To install a custom package, simply copy it to the #{config/packages.chroot/}"
"# directory. Packages that are inside this directory will be automatically "
@@ -1016,7 +1034,7 @@ msgstr ""
"los paquetes."
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:231
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
@@ -1025,7 +1043,7 @@ msgstr ""
"es usar #{dpkg-name}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:233
msgid ""
"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
@@ -1034,12 +1052,12 @@ msgstr ""
"tiene desventajas:"
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:235
msgid "_* It is not possible to use secure APT."
msgstr "_* No es posible utilizar secure APT."
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:237
msgid ""
"_* You must install all appropriate packages in the #{config/packages."
"chroot/}# directory."
@@ -1048,7 +1066,7 @@ msgstr ""
"{config/packages.chroot/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:239
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
@@ -1057,12 +1075,12 @@ msgstr ""
"control de versiones."
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:241
msgid "3~ Using an APT repository to install custom packages"
msgstr "3~ Método de repositorio APT para instalar paquetes personalizados"
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:243
msgid ""
"Unlike using #{packages.chroot}#, when using a custom APT repository you "
"must ensure that you specify the packages elsewhere. See {Choosing packages "
@@ -1074,7 +1092,7 @@ msgstr ""
"los paquetes a instalar}#choosing-packages-to-install."
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:245
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -1085,12 +1103,12 @@ msgstr ""
"reutilizada posteriormente para ofrecer nuevas versiones de los paquetes."
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:247
msgid "3~ Custom packages and APT"
msgstr "3~ Paquetes personalizados y APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:249
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -1105,7 +1123,7 @@ msgstr ""
"seleccionará para instalar el paquete con número de versión superior."
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:251
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -1121,12 +1139,12 @@ msgstr ""
"{APT pinning}#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:253
msgid "2~ Configuring APT at build time"
msgstr "2~ Configurar APT en la creación"
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:255
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -1145,12 +1163,12 @@ msgstr ""
"opciones que comienzan con #{apt}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:257
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr "3~choosing-apt-or-aptitude Utilizar apt o aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:259
msgid ""
"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -1165,7 +1183,7 @@ msgstr ""
"manera de tratar los paquetes no disponibles."
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:261
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
@@ -1174,7 +1192,7 @@ msgstr ""
"instalación fallará. Es el comportamiento por defecto."
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:263
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
@@ -1183,12 +1201,12 @@ msgstr ""
"la instalación continuará sin error."
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:265
msgid "3~ Using a proxy with APT"
msgstr "3~ Utilización de un proxy con APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:267
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -1199,18 +1217,20 @@ msgstr ""
"las opciones #{--apt-ftp-proxy}# o #{--apt-http-proxy}#. Por ejemplo:"
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:271
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
-msgstr ""
+msgstr " $ lb config --apt-http-proxy http://proxy/\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:282
-msgid "3~ Tweaking APT to save space"
+#: en/user_customization-packages.ssi:275
+#, fuzzy
+#| msgid "3~ Tweaking APT to save space"
+msgid "3~tweaking-apt-to-save-space Tweaking APT to save space"
msgstr "3~ Ajuste de APT para ahorrar espacio"
#. type: Plain text
-#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:277
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -1220,7 +1240,7 @@ msgstr ""
"instalación. Las dos opciones descritas a continuación pueden ser de interes."
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:279
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
@@ -1229,13 +1249,13 @@ msgstr ""
"utilizar la siguiente opción:"
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:283
#, no-wrap
msgid " $ lb config --apt-indices false\n"
-msgstr ""
+msgstr " $ lb config --apt-indices false\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:287
msgid ""
"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
@@ -1252,35 +1272,67 @@ msgstr ""
"# o #{apt-get install}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:289
+#, fuzzy
+#| msgid ""
+#| "If you find the installation of recommended packages bloats your image "
+#| "too much, you may disable that default option of APT with:"
msgid ""
"If you find the installation of recommended packages bloats your image too "
-"much, you may disable that default option of APT with:"
+"much, provided you are prepared to deal with the consequences discussed "
+"below, you may disable that default option of APT with:"
msgstr ""
"Si la instalación de los paquetes recomendados aumenta demasiado el tamaño "
"de la imagen, se puede desactivar el valor por defecto de esta opción de APT "
"con:"
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:293
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:304
-msgid ""
-"The tradeoff here is that if you don't install recommended packages for a "
-"given package, that is, \"packages that would be found together with this "
-"one in all but unusual installations\" (Debian Policy Manual, section 7.2), "
-"some packages that you actually need may be omitted. Therefore, we suggest "
-"you review the difference turning off recommends makes to your packages list "
-"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
-"in your list any missing packages that you still want installed. "
-"Alternatively, if you find you only want a small number of recommended "
-"packages left out, leave recommends enabled and set a negative APT pin "
-"priority on selected packages to prevent them from being installed, as "
-"explained in {APT pinning}#apt-pinning."
+msgstr " $ lb config --apt-recommends false\n"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:297
+msgid ""
+"The most important consequence of turning off recommends is that #{live-boot}"
+"# and #{live-config}# themselves recommend some packages that provide "
+"important functionality used by most Live configurations, such as #{user-"
+"setup}# which #{live-config}# recommends and is used to create the live "
+"user. In all but the most exceptional circumstances you need to add back at "
+"least some of these recommends to your package lists or else your image will "
+"not work as expected, if at all. Look at the recommended packages for each "
+"of the #{live-*}# packages included in your build and if you are not certain "
+"you can omit them, add them back into your package lists."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:299
+#, fuzzy
+#| msgid ""
+#| "The tradeoff here is that if you don't install recommended packages for a "
+#| "given package, that is, \"packages that would be found together with this "
+#| "one in all but unusual installations\" (Debian Policy Manual, section "
+#| "7.2), some packages that you actually need may be omitted. Therefore, we "
+#| "suggest you review the difference turning off recommends makes to your "
+#| "packages list (see the #{binary.packages}# file generated by #{lb build}"
+#| "#) and re-include in your list any missing packages that you still want "
+#| "installed. Alternatively, if you find you only want a small number of "
+#| "recommended packages left out, leave recommends enabled and set a "
+#| "negative APT pin priority on selected packages to prevent them from being "
+#| "installed, as explained in {APT pinning}#apt-pinning."
+msgid ""
+"The more general consequence is that if you don't install recommended "
+"packages for any given package, that is, \"packages that would be found "
+"together with this one in all but unusual installations\" (Debian Policy "
+"Manual, section 7.2), some packages that users of your Live system actually "
+"need may be omitted. Therefore, we suggest you review the difference turning "
+"off recommends makes to your packages list (see the #{binary.packages}# file "
+"generated by #{lb build}#) and re-include in your list any missing packages "
+"that you still want installed. Alternatively, if you find you only want a "
+"small number of recommended packages left out, leave recommends enabled and "
+"set a negative APT pin priority on selected packages to prevent them from "
+"being installed, as explained in {APT pinning}#apt-pinning."
msgstr ""
"Lo que está en juego aqui es que, si no se instalan los paquetes "
"recomendados para un paquete dado, esto es «los paquetes que supuestamente "
@@ -1296,12 +1348,12 @@ msgstr ""
"explica en {APT pinning}#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:301
msgid "3~ Passing options to apt or aptitude"
msgstr "3~ Pasar opciones a apt o a aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:303
msgid ""
"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1315,12 +1367,12 @@ msgstr ""
"y #{aptitude}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:305
msgid "3~apt-pinning APT pinning"
msgstr "3~apt-pinning APT pinning"
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:307
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1334,7 +1386,7 @@ msgstr ""
"includes.chroot/etc/apt/preferences}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:309
msgid ""
"Let's say you are building a wheezy live system but need all the live "
"packages that end up in the binary image to be installed from sid at build "
@@ -1352,7 +1404,7 @@ msgstr ""
"se puede realizar de la siguiente forma:"
#. type: Plain text
-#: en/user_customization-packages.ssi:322
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
@@ -1361,9 +1413,14 @@ msgid ""
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << END\n"
+" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 600\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" Package: *\n"
@@ -1371,45 +1428,54 @@ msgid ""
" Pin-Priority: 1\n"
" END\n"
msgstr ""
+" Package: *\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 1\n"
+" END\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:326
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
msgstr "*{Nota:}* Se pueden usar comodines en los nombres de los paquetes a fijar (p.ej. *{Package: live-*}*) si se usa una versión de apt igual o superior a 0.8.14. Esto significa que funciona con wheezy usando:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:330
msgid "$ lb config --distribution wheezy"
-msgstr ""
+msgstr "$ lb config --distribution wheezy"
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:334
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
-"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
-"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
-"{gnome-keyring}/ package. This can be done by adding the following stanza to "
-"#{config/chroot_apt/preferences}#:"
+"package. Suppose you are building an LXDE image using #{task-lxde-desktop}# "
+"in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the "
+"user prompted to store wifi passwords in the keyring. This metapackage "
+"depends on /{lxde-core}/, which recommends /{gksu}/, which in turn "
+"recommends /{gnome-keyring}/. So you want to omit the recommended /{gnome-"
+"keyring}/ package. This can be done by adding the following stanza to #"
+"{config/chroot_apt/preferences}#:"
msgstr ""
"Una prioridad pin negativa previene la instalación de un paquete, como puede "
"ser el caso de que no se desee que un paquete recomendado por otro sea "
"instalado al instalar el primero. Supongamos que se está creando una imagen "
-"LXDE mediante la opción #{--package-lists lxde}#, pero no se desea preguntar "
-"al usuario si desea almacenar las claves wifi en el almacen de claves. La "
-"lista lxde incluye /{gdm}/, la cual depende de /{gksu}/ que a su vez "
-"recomienda /{gnome-keyring}/. Así que el objetivo es omitir la instalación "
-"del paquete /{gnome-keyring}/, que puede conseguirse añadiendo un fichero "
-"con el siguiente contenido a #{config/chroot_apt/preferences}#:"
+"LXDE añadiendo #{task-lxde-desktop}# en #{config/package-lists/lxde-desktop."
+"list.chroot}#, pero no se desea preguntar al usuario si desea almacenar las "
+"claves wifi en el almacen de claves. Este metapaquete depende de /{lxde-"
+"core}/, el cual recomienda /{gksu}/ que a su vez recomienda /{gnome-"
+"keyring}/. Así que el objetivo es omitir la instalación del paquete /{gnome-"
+"keyring}/, que puede conseguirse añadiendo un fichero con el siguiente "
+"contenido a #{config/chroot_apt/preferences}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:345
+#: en/user_customization-packages.ssi:340
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
" Pin: version *\n"
" Pin-Priority: -1\n"
msgstr ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
diff --git a/manual/po/es/user_customization-runtime.ssi.po b/manual/po/es/user_customization-runtime.ssi.po
index f6f129d..a0dc137 100644
--- a/manual/po/es/user_customization-runtime.ssi.po
+++ b/manual/po/es/user_customization-runtime.ssi.po
@@ -2,23 +2,21 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
-"PO-Revision-Date: 2012-07-20 22:58+0100\n"
-"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
-"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
+"POT-Creation-Date: 2012-07-27 21:48+0300\n"
+"PO-Revision-Date: 2012-08-07 14:27+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -230,6 +228,10 @@ msgid ""
" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
" >> config/preseed/my.preseed.chroot\n"
msgstr ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+" >> config/preseed/my.preseed.chroot\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:23
@@ -254,7 +256,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:29
#, no-wrap
msgid " $ lb config --bootappend-live \"username=live-user\"\n"
-msgstr ""
+msgstr " $ lb config --bootappend-live \"username=live-user\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:33
@@ -311,7 +313,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
-msgstr ""
+msgstr " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:51
@@ -340,8 +342,8 @@ msgstr ""
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 "
+"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:"
@@ -349,8 +351,8 @@ msgstr ""
"#{live-config}# se encarga de la configuración del teclado de la consola y "
"del entorno gráfico X utilizando el paquete #{console-setup}#. Para "
"configurarlos se puede utilizar los parámetros de arranque #{keyboard-"
-"layouts}#, #{keyboard-variant}#, #{keyboard-options}# y #{keyboard-model}# a "
-"través de la opción #{--bootappend-live}#. Se puede encontrar una lista de "
+"layouts}#, #{keyboard-variants}#, #{keyboard-options}# y #{keyboard-model}# "
+"a través de la opción #{--bootappend-live}#. Se puede encontrar una lista de "
"opciones válidas para estos parámetros en #{/usr/share/X11/xkb/rules/base."
"lst}#. Para hallar la distribución del teclado y la variante que corresponde "
"a un idioma se puede buscar el nombre en inglés de la nación donde se habla "
@@ -371,6 +373,16 @@ msgid ""
" de_mac ch: German (Switzerland, Macintosh)\n"
" ! option\n"
msgstr ""
+"$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst\n"
+" ! model\n"
+" ! layout\n"
+" ch German (Switzerland)\n"
+" ! variant\n"
+" legacy ch: German (Switzerland, legacy)\n"
+" de_nodeadkeys ch: German (Switzerland, eliminate dead keys)\n"
+" de_sundeadkeys ch: German (Switzerland, Sun dead keys)\n"
+" de_mac ch: German (Switzerland, Macintosh)\n"
+" ! option\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:72
@@ -393,7 +405,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:78
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
-msgstr ""
+msgstr " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:82
@@ -412,8 +424,10 @@ msgstr ""
#, no-wrap
msgid ""
" $ 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"
msgstr ""
+" $ lb config --bootappend-live \\\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
@@ -422,17 +436,17 @@ msgid ""
"{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:"
+"# 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:"
msgstr ""
"Para cada una de las variables de configuración del teclado #{keyboard-*}# "
"se puede especificar varios valores separados por comas. A excepción de #"
"{keyboard-model}#, que sólo acepta un valor. En la página de manual #"
"{keyboard(5)}# se explican los detalles y algunos ejemplos de cómo utilizar "
"las variables #{XKBMODEL}#, #{XKBLAYOUT}#, #{XKBVARIANT}# y #{XKBOPTIONS}#. "
-"Si se especifican diferentes valores en #{keyboard-variant}# estos se "
+"Si se especifican diferentes valores en #{keyboard-variants}# estos se "
"corresponderan uno a uno con los valores #{keyboard-layouts}# (ver #"
"{setxkbmap(1)}# opción #{-variant}#). Se admiten valores vacíos; por ejemplo "
"para definir dos distribuciones de teclado, la que se usa por omisión US "
@@ -443,8 +457,10 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
msgstr ""
+" $ lb config --bootappend-live \\\n"
+" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:100
@@ -582,7 +598,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:124
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
-msgstr ""
+msgstr " # mkfs.ext4 -L persistence /dev/sdb1\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:128
@@ -603,7 +619,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:134
#, no-wrap
msgid " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
-msgstr ""
+msgstr " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:138
@@ -621,6 +637,8 @@ msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
" $ /sbin/mkfs.ext4 -F persistence\n"
msgstr ""
+" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext4 -F persistence\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:147
@@ -670,6 +688,10 @@ msgid ""
" # echo \"/home\" >> /mnt/live-persistence.conf\n"
" # echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
msgstr ""
+" # mkfs.ext4 -L persistence /dev/sdb1\n"
+" # mount -t ext4 /dev/sdb1 /mnt\n"
+" # echo \"/home\" >> /mnt/live-persistence.conf\n"
+" # echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:164
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index 64d392b..13b1a77 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -2,23 +2,21 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com>, 2011
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-19 03:36+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"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
+"POT-Creation-Date: 2012-08-10 22:48+0300\n"
+"PO-Revision-Date: 2012-08-08 15:25+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/live-manual.ssm:61 en/user_examples.ssi:2
@@ -29,7 +27,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 +44,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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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 +98,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 +115,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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:266
#, 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 ""
+msgstr " $ lb config\n"
#. 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:235
#, 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"
@@ -259,6 +259,9 @@ msgid ""
" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
#. type: Plain text
#: en/user_examples.ssi:22
@@ -292,7 +295,7 @@ msgstr "No puede ser más fácil que esto:"
#: en/user_examples.ssi:32
#, no-wrap
msgid " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
-msgstr ""
+msgstr " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
#. type: Plain text
#: en/user_examples.ssi:36
@@ -357,17 +360,19 @@ msgstr ""
"imágenes de Debian 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 ""
+" $ 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 "
@@ -385,7 +390,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 +399,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,37 +435,43 @@ 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"
" $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/\n"
" $ cd tutorial3\n"
msgstr ""
+" $ mkdir -p tutorial3/auto\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/\n"
+" $ cd tutorial3\n"
#. 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 ""
+" lb config noauto \\\n"
+" --architectures i386 \\\n"
+" --linux-flavours 686-pae \\\n"
+" \"${@}\"\n"
#. 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,41 +480,41 @@ 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
+#: 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 ""
-"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}/."
+"En primer lugar con #{--architectures i386}# se asegura de que en un 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 el metapaquete /{lxde}/ para proporcionar un "
+"escritorio mínimo. Y, por último, se añaden dos paquetes 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 +524,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,21 +536,24 @@ msgstr ""
"primer commit:"
#. type: Plain text
-#: en/user_examples.ssi:139
+#: en/user_examples.ssi:137
#, no-wrap
msgid ""
" $ git init\n"
" $ git add auto\n"
" $ git commit -a -m \"Initial import.\"\n"
msgstr ""
+" $ git init\n"
+" $ git add auto\n"
+" $ git commit -a -m \"Initial import.\"\n"
#. 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 ""
+msgstr " # lb clean\n"
#. 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 ""
+msgstr "# lb build"
#. 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 ""
+msgstr " $ git commit -a -m \"Adding vlc media player.\"\n"
#. 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,108 +654,176 @@ 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
+#, fuzzy
+#| msgid ""
+#| "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}/."
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 initial "
+"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:"
+"Crear un directorio de construcción y lanzar una configuración de esqueleto "
+"en su interior, desactivando «recommends» para conseguir un sistema mínimo. "
+"Y a continuación, crear dos listas de paquetes: La primera generada con un "
+"script proporcionado por live-build llamado #{Packages}# (ver {Generar "
+"listas de paquetes}#generated-package-lists), y la segunda lista una que "
+"incluya /{xorg}/, /{gdm3}/, /{metacity}/ y /{xvnc4viewer}/."
#. 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 ""
+" $ mkdir vnc_kiosk_client\n"
+" $ cd vnc_kiosk_client\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"
+
+#. type: Plain text
+#: en/user_examples.ssi:197
+msgid ""
+"As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you "
+"may need to re-add some recommended packages to make your image work "
+"properly."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:199
+msgid "An easy way to list recommends is using /{apt-cache}/. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:203
+#, no-wrap
+msgid " $ apt-cache depends live-config live-boot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
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}#:"
+"In this example we found out that we had to re-include several packages "
+"recommended by live-config and live-boot: #{user-setup}# to make autologin "
+"work and #{sudo}# as an essential program to shutdown the system. Besides, "
+"it could be handy to add #{live-tools}# to be able to copy the image to RAM "
+"and #{eject}# to eventually eject the live media, So:"
msgstr ""
-"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}#:"
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:211
+#, fuzzy
+#| msgid ""
+#| " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my."
+#| "list.chroot\n"
+msgid ""
+"$ echo \"live-tools user-setup sudo eject\" > config/package-lists/"
+"recommends.list.chroot"
+msgstr ""
+" $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my."
+"list.chroot\n"
+
+#. type: Plain text
+#: en/user_examples.ssi:215
+msgid ""
+"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}# en #{config/includes.chroot}# y poner "
+"dentro 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}#:"
+
+#. type: Plain text
+#: en/user_examples.ssi:221
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
" #!/bin/sh\n"
msgstr ""
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
+" #!/bin/sh\n"
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:224
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
" /usr/bin/xvncviewer 192.168.1.2:1\n"
msgstr ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:227
#, no-wrap
msgid ""
" exit\n"
" END\n"
msgstr ""
+" exit\n"
+" END\n"
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:231
msgid "Build the image:"
msgstr "Crear la imagen:"
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:239
msgid "Enjoy."
msgstr "Disfrutarlo."
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:241
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
+#: en/user_examples.ssi:243
#, 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"
-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"
+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 un poco de espacio libre para poder usarlo para lo que se quiera.\n"
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:245
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 "
@@ -749,52 +831,79 @@ msgstr ""
"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."
+"otro tipo de optimizaciones «intrusivas». Cabe destacar que para entender lo "
+"que hace el script gancho #{minimal.chroot}# se debería mirar en #{/usr/"
+"share/doc/live-build/examples/hooks}#"
#. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:250
#, 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 ""
+" $ 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"
+
+#. type: Plain text
+#: en/user_examples.ssi:254
+msgid ""
+"To make the image work properly, we must re-add, at least, two recommended "
+"packages which are left out by the #{--apt-recommends false}# option. See "
+"{Tweaking APT to save space}#tweaking-apt-to-save-space"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:258
+#, fuzzy, no-wrap
+#| msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
+msgid " $ echo \"user-setup sudo\" > config/package-lists/recommends.list.chroot\n"
+msgstr " $ echo vlc >> config/package-lists/my.list.chroot\n"
+
+#. type: Plain text
+#: en/user_examples.ssi:262
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:270
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 "
-"tamaño con la imagen de 166Mbytes producida por la configuración por defecto "
+"anterior produjo una imagen de 95Mbytes. Esto se compara favorablemente en "
+"tamaño con la imagen de 182Mbytes producida por la configuración por defecto "
"en el {Tutorial 1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:272
+#, 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. 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."
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."
+"chroot}# 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 "
@@ -807,23 +916,38 @@ msgstr ""
"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."
+"cierto hardware. #{--memtest none}# evita la instalación de un comprobador "
+"de memoria. Y por último la ejecución del script gancho #{minimal}# elimina "
+"algunos paquetes y ficheros que no se utilizan."
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:274
+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 ""
+"Si se utilizan otros scripts gancho, como por ejemplo el script #{stripped."
+"chroot}# que se encuentra en #{/usr/share/doc/live-build/examples/hooks}#, "
+"se puede reducir aún más el tamaño de la imagen hasta 76MB. Pero es "
+"necesario decidir si vale la pena la funcionalidad que se sacrifica con cada "
+"optimización del tamaño."
+
+#. type: Plain text
+#: en/user_examples.ssi:276
msgid "2~ A localized KDE desktop and installer"
msgstr "2~ Un escritorio KDE con variante local e instalador"
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:278
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr "*{Caso práctico:}* Crear una imagen del escritorio KDE, con la variante local Portugués de Brasil con instalador incluido.\n"
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:280
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -835,7 +959,7 @@ msgstr ""
"Debian para KDE."
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:282
msgid ""
"Our initial problem is the discovery of the names of the appropriate "
"language tasks. Currently, live-build cannot help with this. While we might "
@@ -850,26 +974,28 @@ msgstr ""
"proceder, asegurarse de tener ambas cosas:"
#. type: Plain text
-#: en/user_examples.ssi:260
+#: en/user_examples.ssi:286
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr " # apt-get install dctrl-tools tasksel-data\n"
#. type: Plain text
-#: en/user_examples.ssi:264
+#: en/user_examples.ssi:290
msgid "Now we can search for the appropriate tasks, first with:"
msgstr "Ahora podemos buscar las tareas apropiadas, primero con:"
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:295
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
msgstr ""
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
+" Task: brazilian-portuguese\n"
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:299
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
@@ -878,33 +1004,43 @@ msgstr ""
"brazilian-portuguese. Ahora para encontrar las tareas relacionas: "
#. type: Plain text
-#: en/user_examples.ssi:279
+#: en/user_examples.ssi:305
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
" Task: brazilian-portuguese-kde-desktop\n"
msgstr ""
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
+" Task: brazilian-portuguese-desktop\n"
+" Task: brazilian-portuguese-kde-desktop\n"
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:309
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
-"latin1 keyboard layout. We will also need to preseed our desktop choice, "
-"\"kde\" so that tasksel will install the correct desktop task, as it differs "
-"from the default (see {Desktop and languages tasks}#desktop-and-language-"
-"tasks). Now let's put the pieces together:"
+"latin1 keyboard layout. Now let's put the pieces together. Recalling from "
+"{Using metapackages}#using-metapackages that task metapackages are prefixed #"
+"{task-}#, we just specify these language boot parameters, then add standard "
+"priority packages and all our discovered task metapackages to our package "
+"list as follows:"
msgstr ""
-"En el momento del arranque se van a generar las variantes locales pt_BR."
-"UTF-8 y seleccionar la distribución del teclado pt-latin1. También será "
-"necesario preconfigurar la opción de escritorio, \"kde\" para que tasksel "
-"instale la tarea de escritorio correcta, ya que difiere de la de por defecto "
-"(Ver {Tareas de Escritorio e Idioma}#desktop-and-language-tasks). Ahora "
-"vamos a poner las piezas juntas:"
#. type: Plain text
-#: en/user_examples.ssi:297
-#, no-wrap
+#: en/user_examples.ssi:323
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ mkdir live-pt_BR-kde\n"
+#| " $ cd live-pt_BR-kde\n"
+#| " $ lb config \\\n"
+#| " -a i386 \\\n"
+#| " -k 486 \\\n"
+#| " --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
+#| " --debian-installer live\n"
+#| " $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+#| " brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
+#| " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+#| " $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgid ""
" $ mkdir live-pt_BR-kde\n"
" $ cd live-pt_BR-kde\n"
@@ -913,14 +1049,25 @@ msgid ""
" -k 486 \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \\\n"
+" task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot\n"
+msgstr ""
+" $ mkdir live-pt_BR-kde\n"
+" $ cd live-pt_BR-kde\n"
+" $ lb config \\\n"
+" -a i386 \\\n"
+" -k 486 \\\n"
+" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
+" --debian-installer live\n"
" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
-msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:300
+#: en/user_examples.ssi:326
msgid ""
"Note that we have included the debian-installer-launcher package to launch "
"the installer from the live desktop, and have also specified the 486 flavour "
diff --git a/manual/po/es/user_installation.ssi.po b/manual/po/es/user_installation.ssi.po
index 188424c..3bbfc90 100644
--- a/manual/po/es/user_installation.ssi.po
+++ b/manual/po/es/user_installation.ssi.po
@@ -2,28 +2,27 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-16 18:50+0300\n"
-"PO-Revision-Date: 2012-02-19 21:35+0100\n"
-"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
-"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"POT-Creation-Date: 2012-08-08 13:49+0300\n"
+"PO-Revision-Date: 2012-08-08 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: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi: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 +39,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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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 +93,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,57 +110,58 @@ 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
msgstr " $ lb config --archives live.debian.net\n"
@@ -199,10 +200,10 @@ msgstr "_* Una versión actualizada de live-build"
#. type: Plain text
#: en/user_installation.ssi:14
-msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
+msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/"
msgstr ""
"_* Un intérprete de comandos compatible con POSIX, como por ejemplo /{bash}/ "
-"o /{dash}/."
+"o /{dash}/"
#. type: Plain text
#: en/user_installation.ssi:16
@@ -211,8 +212,8 @@ msgstr "_* /{debootstrap}/ o /{cdebootstrap}/"
#. type: Plain text
#: en/user_installation.ssi:18
-msgid "_* Linux 2.6.x"
-msgstr "_* Linux 2.6.x"
+msgid "_* Linux 2.6.x or 3.x"
+msgstr "_* Linux 2.6.x o 3.x"
#. type: Plain text
#: en/user_installation.ssi:20
@@ -272,7 +273,7 @@ msgstr "Simplemente instalar live-build como cualquier otro paquete:"
#: en/user_installation.ssi:40
#, no-wrap
msgid " # apt-get install live-build\n"
-msgstr ""
+msgstr " # apt-get install live-build\n"
#. type: Plain text
#: en/user_installation.ssi:44
@@ -283,7 +284,7 @@ msgstr "o"
#: en/user_installation.ssi:48
#, no-wrap
msgid " # aptitude install live-build\n"
-msgstr ""
+msgstr " # aptitude install live-build\n"
#. type: Plain text
#: en/user_installation.ssi:52 en/user_installation.ssi:108
@@ -305,7 +306,7 @@ msgstr ""
#: en/user_installation.ssi:58
#, no-wrap
msgid " $ git clone git://live.debian.net/git/live-build.git\n"
-msgstr ""
+msgstr " $ git clone git://live.debian.net/git/live-build.git\n"
#. type: Plain text
#: en/user_installation.ssi:62
@@ -320,6 +321,9 @@ msgid ""
" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
" $ cd ..\n"
msgstr ""
+" $ cd live-build\n"
+" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
+" $ cd ..\n"
#. type: Plain text
#: en/user_installation.ssi:72
@@ -334,7 +338,7 @@ msgstr ""
#: en/user_installation.ssi:76
#, no-wrap
msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
-msgstr ""
+msgstr " # dpkg -i live-build_2.0.8-1_all.deb\n"
#. type: Plain text
#: en/user_installation.ssi:80
@@ -346,7 +350,7 @@ msgstr ""
#: en/user_installation.ssi:84
#, no-wrap
msgid " # make install\n"
-msgstr ""
+msgstr " # make install\n"
#. type: Plain text
#: en/user_installation.ssi:88
@@ -357,10 +361,10 @@ msgstr "y desinstalarlo con:"
#: en/user_installation.ssi:92
#, no-wrap
msgid " # make uninstall\n"
-msgstr ""
+msgstr " # make uninstall\n"
#. type: Plain text
-#: en/user_installation.ssi:96 en/user_installation.ssi:142
+#: en/user_installation.ssi:96 en/user_installation.ssi:149
msgid "3~ From 'snapshots'"
msgstr "3~ A partir de «instantáneas» "
@@ -418,6 +422,8 @@ msgid ""
" $ git clone git://live.debian.net/git/live-boot.git\n"
" $ git clone git://live.debian.net/git/live-config.git\n"
msgstr ""
+" $ git clone git://live.debian.net/git/live-boot.git\n"
+" $ git clone git://live.debian.net/git/live-config.git\n"
#. type: Plain text
#: en/user_installation.ssi:121
@@ -472,32 +478,62 @@ msgid ""
" $ cd ../live-config\n"
" $ dpkg-buildpackage -b -uc -us\n"
msgstr ""
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
#. type: Plain text
#: en/user_installation.ssi:138
-msgid "_* Use all generated .deb files"
-msgstr "_* Utilizar todos los ficheros .deb generados"
+msgid "_* Use applicable generated .deb files"
+msgstr "_* Utilizar los ficheros .deb generados que proceda"
#. type: Plain text
#: en/user_installation.ssi:140
msgid ""
"As live-boot and live-config are installed by live-build system, installing "
"the packages in the host system is not sufficient: you should treat the "
-"generated .deb files like any other custom packages. Please see {Customizing "
-"package installation}#customizing-package-installation for more information. "
-"You should pay particular attention to {Additional repositories}#additional-"
-"repositories."
+"generated .deb files like any other custom packages. Since your purpose for "
+"building from source is like to test new things over the short term before "
+"the official release, follow {Installing modified or third-party packages}"
+"#installing-modified-or-third-party-packages to temporarily include the "
+"relevant files in your configuration. In particular, notice that both "
+"packages are divided into a generic part, a documentation part and one or "
+"more back-ends. Include the generic part, only one back-end matching your "
+"configuration, and optionally the documentation. Assuming you are building a "
+"live image in the current directory and have generated all .deb files for a "
+"single version of both packages in the directory above, these bash commands "
+"would copy all of the relevant packages including default back-ends:"
+msgstr ""
+"Como live-boot y live-config son instalados por el sistema de construcción "
+"live-build, la instalación de esos paquetes en el sistema anfitrión no es "
+"suficiente: se debe tratar los .deb generados como si fueran paquetes "
+"personalizados. Puesto que el propósito de la construcción de estos paquetes "
+"a partir del código fuente es similar a probar cosas nuevas a corto plazo "
+"antes de su lanzamiento oficial, seguir las instrucciones de {Instalar "
+"paquetes modificados o de terceros}#installing-modified-or-third-party-"
+"packages para incluir temporalmente los ficheros necesarios en la "
+"configuración. En particular, observar que ambos paquetes se dividen en una "
+"parte genérica, una parte de documentación y uno o más back-ends. Incluir la "
+"parte genérica, sólo uno de los back-ends que coincida con la configuración, "
+"y, opcionalmente, la documentación. Suponiendo que se está construyendo una "
+"imagen en vivo en el directorio actual y se han generado todos los .deb para "
+"una única versión de los dos paquetes en el directorio superior, estos "
+"comandos bash copiaran todos los paquetes necesarios, incluyendo sus back-"
+"ends por defecto:"
+
+#. type: Plain text
+#: en/user_installation.ssi:145
+#, no-wrap
+msgid ""
+" $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/\n"
+" $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/\n"
msgstr ""
-"Como live-boot y live-config son instalados por el sistema live-build, la "
-"instalación de estos paquetes en el sistema anfitrión no es suficiente: Se "
-"deben tratar los archivos .deb generados exáctamente igual que cualquier "
-"otro paquete personalizado. Véase {Personalización de la instalación de "
-"paquetes}#customizing-package-installation para más información. Se debe "
-"prestar especial atención a los {Repositorios adicionales}#additional-"
-"repositories."
+" $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/\n"
+" $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/\n"
#. type: Plain text
-#: en/user_installation.ssi:144
+#: en/user_installation.ssi:151
msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
diff --git a/manual/po/es/user_managing_a_configuration.ssi.po b/manual/po/es/user_managing_a_configuration.ssi.po
index 9f08a8a..4c3ffb9 100644
--- a/manual/po/es/user_managing_a_configuration.ssi.po
+++ b/manual/po/es/user_managing_a_configuration.ssi.po
@@ -2,29 +2,27 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-19 03:36+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"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
+"POT-Creation-Date: 2012-08-07 13:47+0300\n"
+"PO-Revision-Date: 2012-08-08 14:49+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi: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 +39,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 +93,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 +110,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,184 +184,256 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:8
-msgid "2~ Use auto to manage configuration changes"
-msgstr "2~ Utilización de auto para gestionar los cambios de la configuración"
+msgid "2~ Dealing with configuration changes"
+msgstr "2~ Gestionar los cambios de 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."
+"Las configuraciones en vivo rara vez son perfectas al primer intento. Puede "
+"estar bien pasar opciones a #{lb config}# en la línea de comandos para "
+"realizar una construcción única, pero es más típico revisar esas opciones y "
+"construir de nuevo hasta quedar satisfecho. Para apoyar estos cambios, se "
+"pueden utilizar scripts auto que garanticen que la configuración se mantiene "
+"en un estado coherente."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
-msgid ""
-"For example, when the distribution is first set, many 'dependent' variables "
-"are given default values that suit that distribution. However, if you later "
-"decide to change the distribution, those dependent variables continue to "
-"retain old values that are no longer appropriate."
-msgstr ""
-"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."
+msgid "3~ Why use auto scripts? What do they do?"
+msgstr "3~ ¿Por qué utilizar scripts auto? ¿Qué hacen?"
#. 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."
+"El comando #{lb config}# almacena las opciones que se le pasan en ficheros "
+"en el directorio #{config/*}#, junto con muchas otras opciones que figuran "
+"en sus valores predeterminados. Si se ejecuta #{lb config}# una vez más, no "
+"restablecerá ninguna opción que se estableció como por defecto en función de "
+"las opciones iniciales. Así, por ejemplo, si se ejecuta #{lb config}# otra "
+"vez con un nuevo valor para #{--distribution}#, todas las opciones que se "
+"establecieron como predeterminadas para la distribución anteriormente ya no "
+"pueden funcionar con la nueva configuración. Estos archivos tampoco estan "
+"destinados a ser leídos o editados. Almacenan valores para más de cien "
+"opciones, para que nadie sea capaz de ver las opciones que se especificó "
+"realmente. Y por último, si se ejecuta #{lb config}# y a continuación se "
+"actualiza live-build y hay alguna opción que cambió de nombre, #{config/*}# "
+"todavía tendrá variables con las opciones viejas que ya no son válidas."
#. 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 ""
-"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)."
+"Por todas estas razones, los scripts #{auto/*}# nos hacen la vida más fácil. "
+"Son simples envoltorios para los comandos #{lb config}#, #{lb build}# y #{lb "
+"clean}# diseñados para ayudar a administrar una configuración. El script #"
+"{auto/config}# contiene el comando #{lb config}# con todas las opciones que "
+"se desea, el script #{auto/clean}# elimina los ficheros que contienen "
+"variables de configuración y el fichero #{auto/build}# crea un #{build.log}# "
+"de cada creación. Cada uno de estos scripts se ejecuta automáticamente cada "
+"vez que se ejecuta la orden #{lb}# correspondiente. Mediante el uso de estos "
+"scripts, la configuración es más fácil de leer y se mantiene internamente "
+"coherente de una revisión a la siguiente. Además, será mucho más fácil "
+"identificar y corregir las opciones que necesitan cambiarse tras actualizar "
+"live-build y leer la documentación actualizada."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
-msgid "2~ Example auto scripts"
-msgstr "2~ Un ejemplo de scripts auto."
+msgid "3~ Use example auto scripts"
+msgstr "2~ Usar scripts auto de ejemplo"
#. 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/*}#). "
+"Para mayor comodidad, live-build contiene shell scripts auto de ejemplo que "
+"se pueden copiar y editar. Iniciar una nueva configuración por defecto y a "
+"continuación, copiar los ejemplos:"
#. 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 ""
+" $ mkdir mylive && cd mylive && lb config\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:29
+msgid "Edit #{auto/config}#, adding any options as you see fit. For instance:"
+msgstr ""
+"Editar #{auto/config}#, añadiendo las opciones que se desee. Por ejemplo:"
+
+#. 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 ""
+" #!/bin/sh\n"
+" lb config noauto \\\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"
#. 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 ""
+"Ahora, cada vez que se utilize #{lb config}#, #{auto/config}# reiniciará la "
+"configuración basándose en estas opciones. Cuando se desee realizar cambios, "
+"se deben editar las opciones en este fichero en lugar de pasarlas a #{lb "
+"config}#. Cuando se utilize #{lb clean}#, #{auto/clean}# limpiará los "
+"ficheros en #{config/*}# junto a los otros productos de construcción. Y, por "
+"último, cuando se utilice #{lb build}#, #{auto/build}# creará un log del "
+"proceso de construcción llamado #{build.log}#."
#. 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 ""
+"Nota: Aquí se utiliza #{noauto}#, un parámetro especial para suprimir otra "
+"llamada a #{auto/config}#, evitando así una repetición infinita. Asegurarse "
+"de no eliminarlo accidentalmente al hacer cambios en el fichero. Tener "
+"cuidado al dividir el comando #{lb config}# en varias líneas para facilitar "
+"la lectura, como se muestra en el ejemplo anterior, ya que no debe olvidarse "
+"la barra invertida (\\) al final de cada línea que sigue en la siguiente."
#. 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 "2~ Clonar una configuración publicada a través de Git"
#. 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 ""
+"Utilizar la opción #{lb config --config}# para clonar un repositorio Git que "
+"contenga una configuración de Debian Live. Si se desea basar la "
+"configuración en una mantenida por el proyecto Debian Live, visitar los "
+"repositorios con el prefijo #{config-}# en 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 ""
-"Estos scripts auto vienen de serie con las herramientas live-build. Bastaría "
-"con copiar estos scripts como punto de partida."
+"Por ejemplo, para construir una imagen de rescate, utilizar el repositorio #"
+"{config-rescue}# de la siguiente manera:"
#. 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 --config git://live.debian.net/git/config-rescue.git\n"
msgstr ""
+" $ mkdir live-rescue && cd live-rescue\n"
+" $ lb config --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 ""
-"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. "
+"Editar #{auto/config}#y cualquier otra cosa que se necesite en el árbol #"
+"{config}# para adaptarlo a las propias necesidades."
+
+#. 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 ""
+"Si se desea, se puede definir un método abreviado en la configuración de "
+"Git, añadiendo lo siguiente al fichero #{${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 ""
+"Esto permite utilizar #{ldn:}# en cualquier lugar en que se tenga que "
+"especificar la dirección de un repositorio git de #{live.debian.net}#. Si se "
+"omite el sufijo #{.git}#, comenzar una nueva imagen con esta configuración "
+"es tan fácil como:"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:76
+#, no-wrap
+msgid " $ lb config --config ldn:config-rescue\n"
+msgstr " $ lb config --config ldn:config-rescue\n"
diff --git a/manual/po/es/user_overview.ssi.po b/manual/po/es/user_overview.ssi.po
index 923cdd5..4ac55b4 100644
--- a/manual/po/es/user_overview.ssi.po
+++ b/manual/po/es/user_overview.ssi.po
@@ -2,29 +2,27 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
# Translated and revised by:
-# José Luis Zabalza <jlz.3008 at gmail.com> and
-# Carlos Zuferri «chals» <chals at altorricon.com>
+# José Luis Zabalza <jlz.3008 at gmail.com>, 2011.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-16 18:50+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"
-"Language-Team: Debian live Spanish translation team <debian-live at lists."
-"debian.org>\n"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
+"PO-Revision-Date: 2012-08-07 14:34+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi: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 +39,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 +93,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 +110,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,10 +330,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
@@ -345,17 +355,12 @@ 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:"
+"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 ""
+"especificar la distribución que se desea construir utilizando su nombre en "
+"clave:"
#. type: Plain text
#: en/user_overview.ssi:55
@@ -366,7 +371,7 @@ msgstr "Es posible especificar muchas opciones, tales como:"
#: 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/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 187f0b6..57df559 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -2,20 +2,20 @@
# 2010 Christophe Siraut <chris at tobald.eu.org>
# This file is distributed under the same license as the live-manual package.
# Creak <romain.failliot at foolstep.com>, 2010, 2011.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"POT-Creation-Date: 2012-06-24 19:21+0300\n"
-"PO-Revision-Date: 2012-06-24 20:12+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"PO-Revision-Date: 2012-08-07 14:49+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:2
@@ -490,7 +490,7 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:90
msgid "$ git clone git://live.debian.net/git/live-manual.git"
-msgstr ""
+msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
@@ -577,7 +577,7 @@ msgstr ""
#: en/about_manual.ssi:98
#, no-wrap
msgid " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
-msgstr ""
+msgstr " # apt-get install make po4a sisu-complete libnokogiri-ruby\n"
#. type: Plain text
#: en/about_manual.ssi:102
@@ -592,7 +592,7 @@ msgstr ""
#: en/about_manual.ssi:106
#, no-wrap
msgid " $ make build\n"
-msgstr ""
+msgstr " $ make build\n"
#. type: Plain text
#: en/about_manual.ssi:110
@@ -609,7 +609,7 @@ msgstr ""
#: en/about_manual.ssi:114
#, no-wrap
msgid " $ make build LANGUAGES=en\n"
-msgstr ""
+msgstr " $ make build LANGUAGES=en\n"
#. type: Plain text
#: en/about_manual.ssi:118
@@ -621,7 +621,7 @@ msgstr ""
#: en/about_manual.ssi:122
#, no-wrap
msgid " $ make build FORMATS=pdf\n"
-msgstr ""
+msgstr " $ make build FORMATS=pdf\n"
#. type: Plain text
#: en/about_manual.ssi:126
@@ -632,7 +632,7 @@ msgstr "Ou combiner les deux, par exemple:"
#: en/about_manual.ssi:130
#, no-wrap
msgid " $ make build LANGUAGES=it FORMATS=html\n"
-msgstr ""
+msgstr " $ make build LANGUAGES=it FORMATS=html\n"
#. type: Plain text
#: en/about_manual.ssi:134
@@ -667,6 +667,12 @@ msgid ""
" -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
msgstr ""
+" $ mkdir -p ~/.ssh/identity.d\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
#. type: Plain text
#: en/about_manual.ssi:151
@@ -684,6 +690,12 @@ msgid ""
" IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
" EOF\n"
msgstr ""
+" $ cat >> ~/.ssh/config << EOF\n"
+" Host live.debian.net\n"
+" Hostname live.debian.net\n"
+" User git\n"
+" IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
+" EOF\n"
#. type: Plain text
#: en/about_manual.ssi:164
@@ -697,6 +709,8 @@ msgid ""
" $ git clone git at live.debian.net:/live-manual.git\n"
" $ cd live-manual && git checkout debian-next\n"
msgstr ""
+" $ git clone git at live.debian.net:/live-manual.git\n"
+" $ cd live-manual && git checkout debian-next\n"
#. type: Plain text
#: en/about_manual.ssi:173
@@ -737,7 +751,7 @@ msgstr ""
#: en/about_manual.ssi:181
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
-msgstr ""
+msgstr " $ git commit -a -m \"Adding a section on applying patches.\"\n"
#. type: Plain text
#: en/about_manual.ssi:185
@@ -748,7 +762,7 @@ msgstr "_* Envoyez votre commit au serveur:"
#: en/about_manual.ssi:189
#, no-wrap
msgid " $ git push\n"
-msgstr ""
+msgstr " $ git push\n"
#. type: Plain text
#: en/about_manual.ssi:193
diff --git a/manual/po/fr/about_project.ssi.po b/manual/po/fr/about_project.ssi.po
index 0126c78..21b46b5 100644
--- a/manual/po/fr/about_project.ssi.po
+++ b/manual/po/fr/about_project.ssi.po
@@ -9,7 +9,7 @@ msgstr ""
"POT-Creation-Date: 2012-05-25 14:30+0300\n"
"PO-Revision-Date: 2012-03-17 19:45+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/manual/po/fr/index.html.in.po b/manual/po/fr/index.html.in.po
index bbd2ab7..b268d87 100644
--- a/manual/po/fr/index.html.in.po
+++ b/manual/po/fr/index.html.in.po
@@ -2,7 +2,7 @@
# 2010 Christophe Siraut <chris at tobald.eu.org>
# This file is distributed under the same license as the live-manual package.
# Carlo Stemberger <carlo.stemberger at gmail.com>, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
"POT-Creation-Date: 2012-06-02 18:16+0300\n"
"PO-Revision-Date: 2011-12-26 19:07+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index c8f5f14..f456006 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -2,26 +2,26 @@
# Copyright (C) 2011 Carlos Zuferri «chals» <chals at altorricon.com>
# This file is distributed under the same license as the live-manual package.
# This po file is part of the live-manual package created by the:
-# Debian Live Project
-# <http://live.debian.net/>
+# Debian Live Project <http://live.debian.net/>
+# Carlos Zuferri <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-27 00:01+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"
+"POT-Creation-Date: 2012-08-10 22:48+0300\n"
+"PO-Revision-Date: 2012-08-07 14:55+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/live-manual.ssm:2
msgid "% SiSU 2.0"
-msgstr ""
+msgstr "% SiSU 2.0"
#. type: Plain text
#: en/live-manual.ssm:4
@@ -31,7 +31,7 @@ msgstr "@title: Manuel Debian Live"
#. type: Plain text
#: en/live-manual.ssm:6
msgid "@creator: Debian Live Project <debian-live at lists.debian.org>"
-msgstr ""
+msgstr "@creator: Projet Debian Live <debian-live at lists.debian.org>"
#. type: Plain text
#: en/live-manual.ssm:10
@@ -50,31 +50,36 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-07-27\n"
+" :published: 2012-08-10\n"
msgstr ""
"@date:\n"
-" :published: 27.07.2012\n"
+" :published: 10.08.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
-msgstr ""
+msgstr "@publisher: Projet Debian Live <debian-live at lists.debian.org>"
#. type: Plain text
#: en/live-manual.ssm:21
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /squeeze|wheezy|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|jessie|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
+"@make:\n"
+" :bold: /squeeze|wheezy|jessie|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/\n"
+" :num_top: 1\n"
+" :skin: skin_debian-live\n"
#. type: Plain text
#: en/live-manual.ssm:23
msgid ":A~ @title"
-msgstr ""
+msgstr ":A~ @title"
#. type: Plain text
#: en/live-manual.ssm:25
@@ -84,12 +89,12 @@ msgstr ":B~ À propos"
#. type: Plain text
#: en/live-manual.ssm:27
msgid "<< about_manual.ssi"
-msgstr ""
+msgstr "<< about_manual.ssi"
#. type: Plain text
#: en/live-manual.ssm:29
msgid "<< about_project.ssi"
-msgstr ""
+msgstr "<< about_project.ssi"
#. type: Plain text
#: en/live-manual.ssm:31
@@ -99,52 +104,52 @@ msgstr ":B~ Utilisateur"
#. type: Plain text
#: en/live-manual.ssm:33
msgid "<< user_installation.ssi"
-msgstr ""
+msgstr "<< user_installation.ssi"
#. type: Plain text
#: en/live-manual.ssm:35
msgid "<< user_basics.ssi"
-msgstr ""
+msgstr "<< user_basics.ssi"
#. type: Plain text
#: en/live-manual.ssm:37
msgid "<< user_overview.ssi"
-msgstr ""
+msgstr "<< user_overview.ssi"
#. type: Plain text
#: en/live-manual.ssm:39
msgid "<< user_managing_a_configuration.ssi"
-msgstr ""
+msgstr "<< user_managing_a_configuration.ssi"
#. type: Plain text
#: en/live-manual.ssm:41
msgid "<< user_customization-overview.ssi"
-msgstr ""
+msgstr "<< user_customization-overview.ssi"
#. type: Plain text
#: en/live-manual.ssm:43
msgid "<< user_customization-packages.ssi"
-msgstr ""
+msgstr "<< user_customization-packages.ssi"
#. type: Plain text
#: en/live-manual.ssm:45
msgid "<< user_customization-contents.ssi"
-msgstr ""
+msgstr "<< user_customization-contents.ssi"
#. type: Plain text
#: en/live-manual.ssm:47
msgid "<< user_customization-runtime.ssi"
-msgstr ""
+msgstr "<< user_customization-runtime.ssi"
#. type: Plain text
#: en/live-manual.ssm:49
msgid "<< user_customization-binary.ssi"
-msgstr ""
+msgstr "<< user_customization-binary.ssi"
#. type: Plain text
#: en/live-manual.ssm:51
msgid "<< user_customization-installer.ssi"
-msgstr ""
+msgstr "<< user_customization-installer.ssi"
#. type: Plain text
#: en/live-manual.ssm:53
@@ -154,17 +159,17 @@ msgstr ":B~ Projet"
#. type: Plain text
#: en/live-manual.ssm:55
msgid "<< project_bugs.ssi"
-msgstr ""
+msgstr "<< project_bugs.ssi"
#. type: Plain text
#: en/live-manual.ssm:57
msgid "<< project_coding-style.ssi"
-msgstr ""
+msgstr "<< project_coding-style.ssi"
#. type: Plain text
#: en/live-manual.ssm:59
msgid "<< project_procedures.ssi"
-msgstr ""
+msgstr "<< project_procedures.ssi"
#. type: Plain text
#: en/live-manual.ssm:61 en/user_examples.ssi:2
@@ -174,14 +179,14 @@ msgstr ":B~ Exemples"
#. type: Plain text
#: en/live-manual.ssm:63
msgid "<< user_examples.ssi"
-msgstr ""
+msgstr "<< user_examples.ssi"
#. type: Plain text
#: en/live-manual.ssm:65 en/style_guide.ssi:2
msgid ":B~ Appendix"
-msgstr ""
+msgstr ":B~ Appendix"
#. type: Plain text
#: en/live-manual.ssm:66
msgid "<< style_guide.ssi"
-msgstr ""
+msgstr "<< style_guide.ssi"
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index 33d7148..488b29d 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -1,20 +1,20 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-21 03:48+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"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
+"PO-Revision-Date: 2012-08-07 15:35+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -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,14 +172,14 @@ msgstr "1~bugs Rapporter des bogues"
#: 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 ""
"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 "
+"un bogue. Il est préférable de remplir un rapport deux fois plus que jamais. "
+"Toutefois, ce chapitre contient des recommandations pour présenter des "
"rapports de bogues."
#. type: Plain text
@@ -225,9 +227,9 @@ msgstr "2~ Problèmes connus"
#. 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 ""
"Parce que les distributions Debian *{testing}* et Debian *{unstable}* sont "
"une cible mouvante, quand vous les spécifiez comme les distributions du "
@@ -242,8 +244,8 @@ msgstr "% FIXME:"
#: 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 ""
"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-"
@@ -317,12 +319,12 @@ 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 "
+"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 "
+"S'il vous plaît fournir assez d'informations avec votre rapport. Inclure 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 "
@@ -388,17 +390,17 @@ msgstr "_* Version du noyau sur le système live"
#: 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 ""
"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-"
+"script #{auto/build}# (voir {Gestion d'une configuration}#managing-a-"
"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"
@@ -449,9 +451,9 @@ msgstr "2~ Isoler le cas qui échoue, si possible"
#: 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 "
@@ -477,9 +479,9 @@ msgstr "2~ Utilisez le paquet adéquat pour rapporter le bogue"
#. 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 ""
"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 "
@@ -488,8 +490,8 @@ 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 ""
"Toutefois, nous apprécierons si vous essayez de le réduire en fonction de "
"l'endroit où le bogue apparaît."
@@ -506,7 +508,7 @@ 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 ""
"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 "
@@ -518,12 +520,13 @@ msgstr ""
#: 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 ""
"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. "
+"Debian lui-même que probablement nous ne pouvons pas le résoudre "
+"directement. S'il vous plaît rapportez un bogue sur l'outil d'amorçage ou du "
+"paquet défaillant. "
#. type: Plain text
#: en/project_bugs.ssi:90
@@ -559,9 +562,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 ""
"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 "
@@ -577,18 +580,18 @@ msgstr "3~ Au moment du démarrage"
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}"
"#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."
+"échoué, soit 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."
#. type: Plain text
#: en/project_bugs.ssi:102
@@ -599,10 +602,10 @@ msgstr "3~ Au moment de l'exécution"
#: 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 ""
-"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,"
+"Si un paquet a été installé avec succès, mais il échoue tout en exécutant le "
+"système Live, c'est probablement un bogue dans Debian Live. Cependant:"
#. type: Plain text
#: en/project_bugs.ssi:106
@@ -614,8 +617,8 @@ msgstr "2~ Faire les recherches"
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 "
@@ -623,7 +626,7 @@ msgstr ""
"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é."
+"contournement a été proposée."
#. type: Plain text
#: en/project_bugs.ssi:110
@@ -642,8 +645,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 ""
"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/project_coding-style.ssi.po b/manual/po/fr/project_coding-style.ssi.po
index 3e7806b..a92503a 100644
--- a/manual/po/fr/project_coding-style.ssi.po
+++ b/manual/po/fr/project_coding-style.ssi.po
@@ -1,20 +1,20 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"POT-Creation-Date: 2012-04-07 22:16+0300\n"
-"PO-Revision-Date: 2012-04-07 22:29+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"PO-Revision-Date: 2012-08-07 14:58+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
@@ -243,6 +243,9 @@ msgid ""
" bar\n"
" fi\n"
msgstr ""
+" if foo; then\n"
+" bar\n"
+" fi\n"
#. type: Plain text
#: en/project_coding-style.ssi:38 en/project_coding-style.ssi:61
@@ -259,6 +262,10 @@ msgid ""
" bar\n"
" fi\n"
msgstr ""
+" if foo\n"
+" then\n"
+" bar\n"
+" fi\n"
#. type: Plain text
#: en/project_coding-style.ssi:49
@@ -273,6 +280,9 @@ msgid ""
" bar\n"
" }\n"
msgstr ""
+" Foo () {\n"
+" bar\n"
+" }\n"
#. type: Plain text
#: en/project_coding-style.ssi:68
@@ -283,6 +293,10 @@ msgid ""
" bar\n"
" }\n"
msgstr ""
+" Foo ()\n"
+" {\n"
+" bar\n"
+" }\n"
#. type: Plain text
#: en/project_coding-style.ssi:72
@@ -362,13 +376,13 @@ msgstr ""
#: en/project_coding-style.ssi:96
#, no-wrap
msgid " FOO=bar\n"
-msgstr ""
+msgstr " FOO=bar\n"
#. type: Plain text
#: en/project_coding-style.ssi:104
#, no-wrap
msgid " FOO=\"bar\"\n"
-msgstr ""
+msgstr " FOO=\"bar\"\n"
#. type: Plain text
#: en/project_coding-style.ssi:108
@@ -386,6 +400,10 @@ msgid ""
" foobar\n"
" fi\n"
msgstr ""
+" if [ -f \"${FOO}\"/foo/\"${BAR}\"/bar ]\n"
+" then\n"
+" foobar\n"
+" fi\n"
#. type: Plain text
#: en/project_coding-style.ssi:128
@@ -396,6 +414,10 @@ msgid ""
" foobar\n"
" fi\n"
msgstr ""
+" if [ -f \"${FOO}/foo/${BAR}/bar\" ]\n"
+" then\n"
+" foobar\n"
+" fi\n"
#. type: Plain text
#: en/project_coding-style.ssi:132
diff --git a/manual/po/fr/project_procedures.ssi.po b/manual/po/fr/project_procedures.ssi.po
index 75314a7..36c4d13 100644
--- a/manual/po/fr/project_procedures.ssi.po
+++ b/manual/po/fr/project_procedures.ssi.po
@@ -1,20 +1,20 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"POT-Creation-Date: 2012-04-23 20:28+0300\n"
-"PO-Revision-Date: 2012-04-07 19:01+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"PO-Revision-Date: 2012-08-07 14:57+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -190,7 +190,7 @@ msgstr "Avant d'envoyer une version d'un udeb au d-i svn, on doit faire:"
#: en/project_procedures.ssi:14
#, no-wrap
msgid " $ ../../scripts/l10n/output-l10n-changes . -d\n"
-msgstr ""
+msgstr " $ ../../scripts/l10n/output-l10n-changes . -d\n"
#. type: Plain text
#: en/project_procedures.ssi:18
@@ -315,6 +315,11 @@ msgid ""
" -e 's|%codename%|lenny|g' \\\n"
" -e 's|%release_mail%|2009/msg00007.html|g'\n"
msgstr ""
+" $ sed \\\n"
+" -e 's|%major%|5.0|g' \\\n"
+" -e 's|%minor%|5.0.2|g' \\\n"
+" -e 's|%codename%|lenny|g' \\\n"
+" -e 's|%release_mail%|2009/msg00007.html|g'\n"
#. type: Plain text
#: en/project_procedures.ssi:63
@@ -329,7 +334,7 @@ msgstr ""
#: en/project_procedures.ssi:67
#, no-wrap
msgid " Debian Live images for Debian GNU/Linux %major% updated\n"
-msgstr ""
+msgstr " Debian Live images for Debian GNU/Linux %major% updated\n"
#. type: Plain text
#: en/project_procedures.ssi:71
@@ -339,18 +344,21 @@ msgid ""
" updated Live images for its stable distribution Debian GNU/Linux %major%\n"
" (codename \"%codename%\").\n"
msgstr ""
+" The Debian Live project is pleased to announce the availability of\n"
+" updated Live images for its stable distribution Debian GNU/Linux %major%\n"
+" (codename \"%codename%\").\n"
#. type: Plain text
#: en/project_procedures.ssi:73
#, no-wrap
msgid " The images are available for download at:\n"
-msgstr ""
+msgstr " The images are available for download at:\n"
#. type: Plain text
#: en/project_procedures.ssi:75
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr ""
+msgstr " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
#. type: Plain text
#: en/project_procedures.ssi:80
@@ -361,28 +369,32 @@ msgid ""
" along with a few adjustments for serious problems. A full list of the\n"
" changes may be viewed at:\n"
msgstr ""
+" This update incorporates the changes made in the %minor% point release,\n"
+" which adds corrections for security problems to the stable release\n"
+" along with a few adjustments for serious problems. A full list of the\n"
+" changes may be viewed at:\n"
#. type: Plain text
#: en/project_procedures.ssi:82
#, no-wrap
msgid " <http://lists.debian.org/debian-announce/%release_mail%>\n"
-msgstr ""
+msgstr " <http://lists.debian.org/debian-announce/%release_mail%>\n"
#. type: Plain text
#: en/project_procedures.ssi:84
#, no-wrap
msgid " It also includes the following Live-specific changes:\n"
-msgstr ""
+msgstr " It also includes the following Live-specific changes:\n"
#. type: Bullet: ' * '
#: en/project_procedures.ssi:88
msgid "[INSERT LIVE-SPECIFIC CHANGE HERE]"
-msgstr ""
+msgstr "[INSERT LIVE-SPECIFIC CHANGE HERE]"
#. type: Bullet: ' * '
#: en/project_procedures.ssi:88
msgid "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
-msgstr ""
+msgstr "[LARGER ISSUES MAY DESERVE THEIR OWN SECTION]"
#. type: Plain text
#: en/project_procedures.ssi:92
@@ -391,66 +403,68 @@ msgid ""
" URLs\n"
" ----\n"
msgstr ""
+" URLs\n"
+" ----\n"
#. type: Plain text
#: en/project_procedures.ssi:94
#, no-wrap
msgid " Download location of updated images:\n"
-msgstr ""
+msgstr " Download location of updated images:\n"
#. type: Plain text
#: en/project_procedures.ssi:96
#, no-wrap
msgid " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
-msgstr ""
+msgstr " <http://cdimage.debian.org/cdimage/release/current-live/>\n"
#. type: Plain text
#: en/project_procedures.ssi:98
#, no-wrap
msgid " Debian Live project homepage:\n"
-msgstr ""
+msgstr " Debian Live project homepage:\n"
#. type: Plain text
#: en/project_procedures.ssi:100
#, no-wrap
msgid " <http://live.debian.net/>\n"
-msgstr ""
+msgstr " <http://live.debian.net/>\n"
#. type: Plain text
#: en/project_procedures.ssi:102
#, no-wrap
msgid " The current stable distribution:\n"
-msgstr ""
+msgstr " The current stable distribution:\n"
#. type: Plain text
#: en/project_procedures.ssi:104
#, no-wrap
msgid " <http://ftp.debian.org/debian/dists/stable>\n"
-msgstr ""
+msgstr " <http://ftp.debian.org/debian/dists/stable>\n"
#. type: Plain text
#: en/project_procedures.ssi:106
#, no-wrap
msgid " stable distribution information (release notes, errata etc.):\n"
-msgstr ""
+msgstr " stable distribution information (release notes, errata etc.):\n"
#. type: Plain text
#: en/project_procedures.ssi:108
#, no-wrap
msgid " <http://www.debian.org/releases/stable/>\n"
-msgstr ""
+msgstr " <http://www.debian.org/releases/stable/>\n"
#. type: Plain text
#: en/project_procedures.ssi:110
#, no-wrap
msgid " Security announcements and information:\n"
-msgstr ""
+msgstr " Security announcements and information:\n"
#. type: Plain text
#: en/project_procedures.ssi:112
#, no-wrap
msgid " <http://www.debian.org/security/>\n"
-msgstr ""
+msgstr " <http://www.debian.org/security/>\n"
#. type: Plain text
#: en/project_procedures.ssi:116
@@ -459,6 +473,8 @@ msgid ""
" About Debian\n"
" -------------\n"
msgstr ""
+" About Debian\n"
+" -------------\n"
#. type: Plain text
#: en/project_procedures.ssi:120
@@ -468,6 +484,9 @@ msgid ""
" volunteer their time and effort in order to produce the completely free\n"
" operating system Debian GNU/Linux.\n"
msgstr ""
+" The Debian Project is an association of Free Software developers who\n"
+" volunteer their time and effort in order to produce the completely free\n"
+" operating system Debian GNU/Linux.\n"
#. type: Plain text
#: en/project_procedures.ssi:124
@@ -476,6 +495,8 @@ msgid ""
" About Debian Live\n"
" -----------------\n"
msgstr ""
+" About Debian Live\n"
+" -----------------\n"
#. type: Plain text
#: en/project_procedures.ssi:129
@@ -486,6 +507,10 @@ msgid ""
" for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
" filesystem images for booting directly from the internet.\n"
msgstr ""
+" Debian Live is an official sub-project of Debian which produces Debian\n"
+" systems that do not require a classical installer. Images are available\n"
+" for CD/DVD discs, USB sticks and PXE netbooting as well as a bare\n"
+" filesystem images for booting directly from the internet.\n"
#. type: Plain text
#: en/project_procedures.ssi:133
@@ -494,6 +519,8 @@ msgid ""
" Contact Information\n"
" -------------------\n"
msgstr ""
+" Contact Information\n"
+" -------------------\n"
#. type: Plain text
#: en/project_procedures.ssi:137
@@ -503,3 +530,6 @@ msgid ""
" <http://live.debian.net/> or alternatively send mail to\n"
" <debian-live at lists.debian.org>.\n"
msgstr ""
+" For further information, please visit the Debian Live web pages at\n"
+" <http://live.debian.net/> or alternatively send mail to\n"
+" <debian-live at lists.debian.org>.\n"
diff --git a/manual/po/fr/style_guide.ssi.po b/manual/po/fr/style_guide.ssi.po
index 416cfda..345edd6 100644
--- a/manual/po/fr/style_guide.ssi.po
+++ b/manual/po/fr/style_guide.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 17:04+0300\n"
+"POT-Creation-Date: 2012-07-31 23:27+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,13 +18,13 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:65 en/style_guide.ssi:2
msgid ":B~ Appendix"
-msgstr ""
+msgstr ":B~ Appendix"
#. type: Plain text
#: 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
@@ -50,33 +50,35 @@ msgstr ""
#: 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: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: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:218
+#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
#: 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:350
+#: en/user_customization-packages.ssi:358 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: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_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
@@ -94,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
@@ -119,34 +121,36 @@ msgstr "code{"
#: 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:206
+#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:363 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: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_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
@@ -799,41 +803,21 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:220
msgid ""
-"Some translators decide to include the code blocks in the translated files "
-"because it is easier for them to identify what has already been translated "
-"and what has not by looking at the percentages if they use a graphical "
-"translation program."
+"Even though the code blocks are usually untranslatable, including them in "
+"the translation is the only way to score a 100% complete translation. And "
+"even though it means more work at first because it requires the intervention "
+"of the translators if the code changes, it is the best way, in the long run, "
+"to identify what has already been translated and what has not when checking "
+"the integrity of the .po files."
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:222
-msgid ""
-"Include the code blocks if you want to score a 100% complete translation."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:224
-msgid ""
-"On the other hand some translators prefer to leave the code blocks "
-"\"untranslated\" (i.e. not including them). This makes the translation "
-"easier to maintain once finished because it does not require translators "
-"intervention if the code changes."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:226
-msgid ""
-"Leave the code blocks empty (they will be automatically added then) if you "
-"want to make your translation easier to maintain."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:228
msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:230
+#: en/style_guide.ssi:224
msgid ""
"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
@@ -842,48 +826,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:232
+#: en/style_guide.ssi:226
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:234
+#: en/style_guide.ssi:228
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:236
+#: en/style_guide.ssi:230
msgid "Translators should never translate:"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:238
+#: en/style_guide.ssi:232
msgid "The code names of releases"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:240
+#: en/style_guide.ssi:234
msgid "The names of programs"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:242
+#: en/style_guide.ssi:236
msgid "The commands given as examples"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:244
+#: en/style_guide.ssi:238
msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:246
+#: en/style_guide.ssi:240
msgid "Links"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:247
+#: en/style_guide.ssi:241
msgid "Paths"
msgstr ""
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index f4a8249..e586fac 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -1,20 +1,20 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"POT-Creation-Date: 2012-07-18 19:47+0300\n"
-"PO-Revision-Date: 2012-04-28 11:39+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"PO-Revision-Date: 2012-08-07 14:51+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -344,7 +344,7 @@ msgstr ""
#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
-msgstr ""
+msgstr " $ lb config\n"
#. type: Plain text
#: en/user_basics.ssi:38
@@ -371,7 +371,7 @@ msgstr ""
#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
-msgstr ""
+msgstr " # lb build\n"
#. type: Plain text
#: en/user_basics.ssi:48
@@ -420,13 +420,13 @@ msgstr ""
#: en/user_basics.ssi:60
#, no-wrap
msgid " # apt-get install wodim\n"
-msgstr ""
+msgstr " # apt-get install wodim\n"
#. type: Plain text
#: en/user_basics.ssi:62
#, no-wrap
msgid " $ wodim binary.hybrid.iso\n"
-msgstr ""
+msgstr " $ wodim binary.hybrid.iso\n"
#. type: Plain text
#: en/user_basics.ssi:66
@@ -471,7 +471,7 @@ msgstr ""
#: en/user_basics.ssi:75
#, no-wrap
msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
-msgstr ""
+msgstr " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
#. type: Plain text
#: en/user_basics.ssi:80
@@ -629,7 +629,7 @@ msgstr ""
#: en/user_basics.ssi:110
#, no-wrap
msgid " # apt-get install qemu-kvm qemu-utils\n"
-msgstr ""
+msgstr " # apt-get install qemu-kvm qemu-utils\n"
#. type: Plain text
#: en/user_basics.ssi:114
@@ -640,7 +640,7 @@ msgstr "Démarrer une image ISO est simple:"
#: en/user_basics.ssi:118
#, no-wrap
msgid " $ kvm -cdrom binary.hybrid.iso\n"
-msgstr ""
+msgstr " $ kvm -cdrom binary.hybrid.iso\n"
#. type: Plain text
#: en/user_basics.ssi:122
@@ -662,13 +662,13 @@ msgstr "Afin de tester l'ISO avec /{virtualbox-ose}/:"
#: en/user_basics.ssi:130
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
-msgstr ""
+msgstr " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
#. type: Plain text
#: en/user_basics.ssi:132
#, no-wrap
msgid " $ virtualbox\n"
-msgstr ""
+msgstr " $ virtualbox\n"
#. type: Plain text
#: en/user_basics.ssi:136
@@ -690,7 +690,7 @@ msgstr "*{Remarque:}* Pour les systèmes live contenant X.org que vous voulez es
#: en/user_basics.ssi:142
#, no-wrap
msgid " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
-msgstr ""
+msgstr " $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot\n"
#. type: Plain text
#: en/user_basics.ssi:146
@@ -729,7 +729,7 @@ msgstr "*{Remarque:}* si vous avez créé une image ISO hybride avec l'exemple p
#: en/user_basics.ssi:154 en/user_basics.ssi:220
#, no-wrap
msgid " # lb clean --binary\n"
-msgstr ""
+msgstr " # lb clean --binary\n"
#. type: Plain text
#: en/user_basics.ssi:158
@@ -744,7 +744,7 @@ msgstr ""
#: en/user_basics.ssi:162
#, no-wrap
msgid " $ lb config -b hdd\n"
-msgstr ""
+msgstr " $ lb config -b hdd\n"
#. type: Plain text
#: en/user_basics.ssi:166 en/user_basics.ssi:234
@@ -803,7 +803,7 @@ msgstr ""
#: en/user_basics.ssi:186
#, no-wrap
msgid " $ kvm -hda binary.img\n"
-msgstr ""
+msgstr " $ kvm -hda binary.img\n"
#. type: Plain text
#: en/user_basics.ssi:190
@@ -828,7 +828,7 @@ msgstr ""
#: en/user_basics.ssi:196
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
-msgstr ""
+msgstr " # gparted ${USBSTICK}\n"
#. type: Plain text
#: en/user_basics.ssi:200
@@ -845,7 +845,7 @@ msgstr ""
#: en/user_basics.ssi:204
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
-msgstr ""
+msgstr " # mkfs.ext4 ${PARTITION}\n"
#. type: Plain text
#: en/user_basics.ssi:208
@@ -894,7 +894,7 @@ msgstr ""
#: en/user_basics.ssi:228
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
-msgstr ""
+msgstr " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
#. type: Plain text
#: en/user_basics.ssi:232
@@ -983,13 +983,13 @@ msgstr ""
#: en/user_basics.ssi:256
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
-msgstr ""
+msgstr " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
#. type: Plain text
#: en/user_basics.ssi:258
#, no-wrap
msgid " ddns-update-style none;\n"
-msgstr ""
+msgstr " ddns-update-style none;\n"
#. type: Plain text
#: en/user_basics.ssi:261
@@ -998,6 +998,8 @@ msgid ""
" option domain-name \"example.org\";\n"
" option domain-name-servers ns1.example.org, ns2.example.org;\n"
msgstr ""
+" option domain-name \"example.org\";\n"
+" option domain-name-servers ns1.example.org, ns2.example.org;\n"
#. type: Plain text
#: en/user_basics.ssi:264
@@ -1006,12 +1008,14 @@ msgid ""
" default-lease-time 600;\n"
" max-lease-time 7200;\n"
msgstr ""
+" default-lease-time 600;\n"
+" max-lease-time 7200;\n"
#. type: Plain text
#: en/user_basics.ssi:266
#, no-wrap
msgid " log-facility local7;\n"
-msgstr ""
+msgstr " log-facility local7;\n"
#. type: Plain text
#: en/user_basics.ssi:272
@@ -1023,6 +1027,11 @@ msgid ""
" filename \"pxelinux.0\";\n"
"}\n"
msgstr ""
+" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
+" range 192.168.0.1 192.168.0.254;\n"
+" next-server servername;\n"
+" filename \"pxelinux.0\";\n"
+"}\n"
#. type: Plain text
#: en/user_basics.ssi:276
@@ -1053,7 +1062,7 @@ msgstr ""
#: en/user_basics.ssi:284
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
-msgstr ""
+msgstr " # dpkg-reconfigure -plow tftpd-hpa\n"
#. type: Plain text
#: en/user_basics.ssi:288
@@ -1094,7 +1103,7 @@ msgstr ""
#: en/user_basics.ssi:300
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
-msgstr ""
+msgstr " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
#. type: Plain text
#: en/user_basics.ssi:304
@@ -1107,7 +1116,7 @@ msgstr ""
#: en/user_basics.ssi:308
#, no-wrap
msgid " # exportfs -rv\n"
-msgstr ""
+msgstr " # exportfs -rv\n"
#. type: Plain text
#: en/user_basics.ssi:312
@@ -1178,6 +1187,14 @@ msgid ""
" sudo /usr/sbin/brctl addif br0 $1\n"
" sleep 2\n"
msgstr ""
+" #!/bin/sh\n"
+" sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1\n"
+" echo \"Executing /etc/qemu-ifup\"\n"
+" echo \"Bringing up $1 for bridged mode...\"\n"
+" sudo /sbin/ifconfig $1 0.0.0.0 promisc up\n"
+" echo \"Adding $1 to br0...\"\n"
+" sudo /usr/sbin/brctl addif br0 $1\n"
+" sleep 2\n"
#. type: Plain text
#: en/user_basics.ssi:339
@@ -1225,6 +1242,11 @@ msgid ""
" memsize = \"512\"\n"
" MemAllowAutoScaleDown = \"FALSE\"\n"
msgstr ""
+" #!/usr/bin/vmware\n"
+" config.version = \"8\"\n"
+" virtualHW.version = \"4\"\n"
+" memsize = \"512\"\n"
+" MemAllowAutoScaleDown = \"FALSE\"\n"
#. type: Plain text
#: en/user_basics.ssi:363
@@ -1236,6 +1258,11 @@ msgid ""
" sound.present = \"FALSE\"\n"
" tools.remindInstall = \"FALSE\"\n"
msgstr ""
+" ide0:0.present = \"FALSE\"\n"
+" ide1:0.present = \"FALSE\"\n"
+" floppy0.present = \"FALSE\"\n"
+" sound.present = \"FALSE\"\n"
+" tools.remindInstall = \"FALSE\"\n"
#. type: Plain text
#: en/user_basics.ssi:366
@@ -1244,6 +1271,8 @@ msgid ""
" ethernet0.present = \"TRUE\"\n"
" ethernet0.addressType = \"generated\"\n"
msgstr ""
+" ethernet0.present = \"TRUE\"\n"
+" ethernet0.addressType = \"generated\"\n"
#. type: Plain text
#: en/user_basics.ssi:369
@@ -1252,6 +1281,8 @@ msgid ""
" displayName = \"Test Boot PXE\"\n"
" guestOS = \"other\"\n"
msgstr ""
+" displayName = \"Test Boot PXE\"\n"
+" guestOS = \"other\"\n"
#. type: Plain text
#: en/user_basics.ssi:374
@@ -1262,6 +1293,10 @@ msgid ""
" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
" ethernet0.generatedAddressOffset = \"0\"\n"
msgstr ""
+" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
+" uuid.location = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" uuid.bios = \"56 4d 83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\"\n"
+" ethernet0.generatedAddressOffset = \"0\"\n"
#. type: Plain text
#: en/user_basics.ssi:378
diff --git a/manual/po/fr/user_customization-binary.ssi.po b/manual/po/fr/user_customization-binary.ssi.po
index c2a5e2a..5eec3b6 100644
--- a/manual/po/fr/user_customization-binary.ssi.po
+++ b/manual/po/fr/user_customization-binary.ssi.po
@@ -1,20 +1,20 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"POT-Creation-Date: 2012-04-08 12:15+0300\n"
-"PO-Revision-Date: 2012-04-28 12:50+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"PO-Revision-Date: 2012-08-07 15:01+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
@@ -216,7 +216,7 @@ msgstr ""
#: en/user_customization-binary.ssi:16
#, no-wrap
msgid " $ lb config --mode progress --syslinux-theme progress-server\n"
-msgstr ""
+msgstr " $ lb config --mode progress --syslinux-theme progress-server\n"
#. type: Plain text
#: en/user_customization-binary.ssi:20
@@ -272,6 +272,10 @@ msgid ""
" prompt 0\n"
" timeout 50\n"
msgstr ""
+" include menu.cfg\n"
+" default vesamenu.c32\n"
+" prompt 0\n"
+" timeout 50\n"
#. type: Plain text
#: en/user_customization-binary.ssi:37
@@ -288,13 +292,13 @@ msgstr ""
#: en/user_customization-binary.ssi:41 en/user_examples.ssi:95
#, no-wrap
msgid " #!/bin/sh\n"
-msgstr ""
+msgstr " #!/bin/sh\n"
#. type: Plain text
#: en/user_customization-binary.ssi:43
#, no-wrap
msgid " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
-msgstr ""
+msgstr " sed -i 's|timeout 0|timeout 50|' binary/isolinux/isolinux.cfg\n"
#. type: Plain text
#: en/user_customization-binary.ssi:47
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index e51d61f..74ecf40 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -1,27 +1,26 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+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"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
+"PO-Revision-Date: 2012-08-07 15:06+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi: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"
@@ -197,14 +197,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 ""
"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 "
+"arbitraires dans votre image live de Debian. live-build prévoit deux "
"mécanismes pour leur utilisation:"
#. type: Plain text
@@ -232,18 +232,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 +239,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 +264,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,20 +277,22 @@ 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"
" $ cp /path/to/my/index.html config/includes.chroot/var/www\n"
msgstr ""
+" $ mkdir -p config/includes.chroot/var/www\n"
+" $ 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 "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"
@@ -314,9 +304,17 @@ msgid ""
" [...]\n"
" `-- templates\n"
msgstr ""
+" -- config\n"
+" [...]\n"
+" |-- includes.chroot\n"
+" | `-- var\n"
+" | `-- www\n"
+" | `-- index.html\n"
+" [...]\n"
+" `-- 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."
@@ -325,12 +323,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 +348,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 ""
+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 ""
"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 +375,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 +402,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 +427,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 +457,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 +475,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-installer.ssi.po b/manual/po/fr/user_customization-installer.ssi.po
index 74c2688..8d1d0d0 100644
--- a/manual/po/fr/user_customization-installer.ssi.po
+++ b/manual/po/fr/user_customization-installer.ssi.po
@@ -1,20 +1,20 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"POT-Creation-Date: 2012-06-03 19:00+0300\n"
-"PO-Revision-Date: 2012-03-19 21:01+0100\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"PO-Revision-Date: 2012-08-07 15:11+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -299,6 +299,9 @@ msgid ""
" --debian-installer live\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgstr ""
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
+" --debian-installer live\n"
+" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
#. type: Plain text
#: en/user_customization-installer.ssi:40
@@ -337,6 +340,8 @@ msgid ""
" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
" >> config/binary_debian-installer/preseed.cfg\n"
msgstr ""
+" $ echo \"d-i debian-installer/locale string en_US\" \\\n"
+" >> config/binary_debian-installer/preseed.cfg\n"
#. type: Plain text
#: en/user_customization-installer.ssi:51
diff --git a/manual/po/fr/user_customization-overview.ssi.po b/manual/po/fr/user_customization-overview.ssi.po
index b9e1d61..ec879a3 100644
--- a/manual/po/fr/user_customization-overview.ssi.po
+++ b/manual/po/fr/user_customization-overview.ssi.po
@@ -1,15 +1,15 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
"POT-Creation-Date: 2012-04-14 16:13+0300\n"
"PO-Revision-Date: 2012-03-17 20:27+0100\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index d5619e2..6c872f6 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -1,26 +1,25 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 22:45+0300\n"
-"PO-Revision-Date: 2012-03-17 19:13+0100\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"POT-Creation-Date: 2012-08-10 22:48+0300\n"
+"PO-Revision-Date: 2012-08-07 15:03+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi: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 +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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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 +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
@@ -107,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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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"
@@ -179,10 +180,10 @@ msgid ""
"areas. To ensure decent download speeds, you should choose a nearby "
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
-"can define your own lists of packages to include, use live-build's "
-"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
-"Finally, a number of options give some control over /{apt}/, or if you "
-"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"can define lists of packages, including metapackages which will install many "
+"related packages at once, such as packages for a particular desktop or "
+"language. Finally, a number of options give some control over /{apt}/, or if "
+"you prefer, /{aptitude}/, at build time when packages are installed. You may "
"find these handy if you use a proxy, want to disable installation of "
"recommended packages to save space, or need to control which versions of "
"packages are installed via APT pinning, to name a few possibilities."
@@ -197,15 +198,15 @@ msgstr ""
"miroir de distribution proche. Vous pouvez également ajouter vos propres "
"dépôts pour les backports, paquets expérimentaux ou personnalisés, ou "
"inclure des paquets directement en tant que fichiers. Vous pouvez définir "
-"vos propres listes de paquets à inclure, utiliser des listes prédéfinies de "
-"live-build, utiliser tâches /{tasksel}/, ou une combinaison des trois. "
-"Enfin, un certain nombre d'options donnent un certain contrôle sur /{apt}/, "
-"ou si vous préférez, /{aptitude}/, au moment de la construction quand les "
-"paquets sont installés. Vous pouvez trouver ces très pratique si vous "
-"utilisez un proxy, vous voulez désactiver l'installation des paquets "
-"recommandés pour économiser l'espace, ou avez besoin de contrôler quels "
-"versions des paquets sont installés via APT pinning, pour n'en nommer "
-"quelques possibilités."
+"des listes de paquets, incluant les métapaquets qui installent nombreux "
+"paquets liés à la fois, telles que les paquets pour un ordinateur de bureau "
+"ou langue particulière. Enfin, un certain nombre d'options donnent un "
+"certain contrôle sur /{apt}/, ou si vous préférez, /{aptitude}/, au moment "
+"de la construction quand les paquets sont installés. Vous pouvez trouver ces "
+"très pratique si vous utilisez un proxy, vous voulez désactiver "
+"l'installation des paquets recommandés pour économiser l'espace, ou avez "
+"besoin de contrôler quels versions des paquets sont installés via APT "
+"pinning, pour n'en nommer quelques possibilités."
#. type: Plain text
#: en/user_customization-packages.ssi:8
@@ -240,10 +241,10 @@ 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 ""
+msgstr " $ lb config --distribution sid\n"
#. type: Plain text
#: en/user_customization-packages.ssi:20
@@ -263,7 +264,7 @@ msgstr ""
#: en/user_customization-packages.ssi:24
#, no-wrap
msgid " $ lb config --archive-areas \"main contrib\"\n"
-msgstr ""
+msgstr " $ lb config --archive-areas \"main contrib\"\n"
#. type: Plain text
#: en/user_customization-packages.ssi:28
@@ -349,6 +350,9 @@ msgid ""
" --mirror-chroot-security http://localhost/debian-security/ \\\n"
"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
msgstr ""
+" $ lb config --mirror-bootstrap http://localhost/debian/ \\\n"
+" --mirror-chroot-security http://localhost/debian-security/ \\\n"
+"\t --mirror-chroot-backports http://localhost/debian-backports/\n"
#. type: Plain text
#: en/user_customization-packages.ssi:48
@@ -394,6 +398,8 @@ msgid ""
" $ lb config --mirror-binary http://mirror/debian/ \\\n"
" --mirror-binary-security http://mirror/debian-security/\n"
msgstr ""
+" $ lb config --mirror-binary http://mirror/debian/ \\\n"
+" --mirror-binary-security http://mirror/debian-security/\n"
#. type: Plain text
#: en/user_customization-packages.ssi:61
@@ -436,7 +442,7 @@ msgstr ""
#: en/user_customization-packages.ssi:69
#, no-wrap
msgid " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
-msgstr ""
+msgstr " deb http://live.debian.net/ sid-snapshots main contrib non-free\n"
#. type: Plain text
#: en/user_customization-packages.ssi:73
@@ -470,10 +476,10 @@ msgid "*{Note:}* some preconfigured package repositories are available for easy
msgstr "*{Remarque:}* certains dépôts de paquets préconfigurés sont disponibles pour une sélection facile grâce à l'option #{--archives}#, par exemple pour activer les instantanés live, il suffit une simple commande:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
-msgstr ""
+msgstr " $ lb config --archives live.debian.net\n"
#. type: Plain text
#: en/user_customization-packages.ssi:87
@@ -485,18 +491,20 @@ msgstr "2~choosing-packages-to-install Choisir les paquets à installer"
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"individual packages to install in a package list. You can also choose "
-"predefined lists of packages, or use APT tasks. And finally, you may place "
-"package files in your #{config/}# tree, which is well suited to testing of "
-"new or experimental packages before they are available from a repository."
-msgstr ""
-"Il y a un certain nombre de façons de choisir quels paquets live-build va "
-"installer dans votre image, couvrant une variété de besoins différents. Vous "
-"pouvez tout simplement nommer les paquets individuels à installer dans une "
-"liste de paquets. Vous pouvez également choisir grandes listes prédéfinies "
-"de paquets, ou utiliser des tâches APT. Et enfin, vous pouvez placer paquets "
-"dans votre arbre #{config/}# qui est bien adapté aux essais de nouveaux "
-"paquets ou expérimentaux avant qu'ils ne soient disponibles sur un dépôt."
+"individual packages to install in a package list. You can also use "
+"metapackages in those lists, or select them using package control file "
+"fields. And finally, you may place package files in your #{config/}# tree, "
+"which is well suited to testing of new or experimental packages before they "
+"are available from a repository."
+msgstr ""
+"Il y a un certain nombre de façons pour choisir quels paquets live-build "
+"installera dans votre image, couvrant une variété de besoins différentes. "
+"Vous pouvez tout simplement nommer les paquets individuels à installer dans "
+"une liste de paquets. Vous pouvez également choisir métapaquets dans ces "
+"listes, ou sélectionner-les en utilisant des champs de paquets de contrôle "
+"de fichiers. Et enfin, vous pouvez placer paquets dans votre arbre #{config/}"
+"# qui est bien adapté aux essais de nouveaux paquets ou expérimentaux avant "
+"qu'ils ne soient disponibles sur un dépôt."
#. type: Plain text
#: en/user_customization-packages.ssi:91
@@ -509,21 +517,15 @@ msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
"which makes it easy to build lists from other lists and adapt them for use "
-"in multiple configurations. You can use predefined package lists, providing "
-"in a modular fashion package selections from each of the major desktop "
-"environments and some special purpose lists, as well as standard lists the "
-"others are based upon. You can also provide your own package lists, or use a "
-"combination of both."
+"in multiple configurations. Package names may also be injected into the list "
+"using shell helpers at build time."
msgstr ""
"Les listes de paquets sont un excellent moyen d'exprimer quels paquets "
"doivent être installés. La syntaxe de la liste soutient les fichiers inclus "
-"et sections conditionnelles qui les rend facile de construire à partir "
+"et sections conditionnelles qui les rend faciles de construire à partir "
"d'autres listes et de les adapter pour une utilisation dans configurations "
-"multiples. Vous pouvez utiliser des listes de paquets prédéfinies, offrant "
-"une sélection modulaire de paquets provenants de chacun des environnements "
-"de bureau majeurs et certaines listes de but spécial, ainsi que les autres "
-"listes standard sont basées sur elles. Vous pouvez également fournir votre "
-"propre liste de paquets, ou utiliser une combinaison des deux."
+"multiples. Les noms des paquets peuvent également être injectés dans la "
+"liste en utilisant assistants de shell au moment de la construction."
#. type: Plain text
#: en/user_customization-packages.ssi:95
@@ -533,54 +535,119 @@ msgstr "*{Remarque:}* Le comportement de live-build pour spécifier un paquet qu
#. type: Plain text
#: en/user_customization-packages.ssi:97
-msgid "3~ Predefined package lists"
-msgstr "3~ Listes de paquets prédéfinies"
+#, fuzzy
+#| msgid "3~ Using metapackages"
+msgid "3~using-metapackages Using metapackages"
+msgstr "3~ Utilisation de métapaquets"
#. type: Plain text
#: en/user_customization-packages.ssi:99
msgid ""
-"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--package-lists}# option. For example:"
+"The simplest way to populate your package list is to use a task metapackage "
+"maintained by your distribution. For example:"
msgstr ""
-"La façon la plus simple d'utiliser des listes consiste à spécifier une ou "
-"plusieurs listes prédéfinies avec la option #{--package-lists}#. Par exemple:"
+"La façon la plus simple pour remplir votre liste de paquets consiste à "
+"utiliser une tâche métapaquet maintenue par votre distribution. Par exemple:"
#. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:104
#, no-wrap
-msgid " $ lb config --package-lists \"gnome rescue\"\n"
+msgid ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
+msgstr ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:108
+msgid ""
+"This supercedes the older predefined list method supported in #{live-build}# "
+"2.x. Unlike predefined lists, task metapackages are not specific to the "
+"Debian Live project. Instead, they are maintained by specialist working "
+"groups within the distribution and therefore reflect the consensus of each "
+"group about which packages best serve the needs of the intended users. They "
+"also cover a much broader range of use cases than the predefined lists they "
+"replace."
+msgstr ""
+"Ceci remplace l'ancienne méthode des listes prédéfinies soutenue dans #{live-"
+"build}# 2.x. Contrairement aux listes prédéfinies, les métapaquets ne sont "
+"pas spécifiques du projet Debian Live. Au lieu de cela, ils sont maintenus "
+"par des groupes de travail spécialisés dans la distribution et reflètent "
+"donc le consensus de chaque groupe sur les paquets pour mieux servir les "
+"besoins des utilisateurs. Ils couvrent également une gamme beaucoup plus "
+"large des cas d'utilisation que les listes prédéfinies qu'ils remplacent."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:110
+msgid ""
+"All task metapackages are prefixed #{task-}#, so a quick way to determine "
+"which are available (though it may contain a handful of false hits that "
+"match the name but aren't metapackages) is to match on the package name with:"
msgstr ""
+"Tous les métapaquets de tâches sont préfixés avec #{task-}#, donc un moyen "
+"rapide pour déterminer lesquels sont disponibles (même si elle peut contenir "
+"une poignée de faux résultats qui correspondent avec le nom, mais ne sont "
+"pas métapaquets) est de faire correspondre le nom du paquet avec:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:114
+#, no-wrap
+msgid " $ apt-cache search --names-only ^task-\n"
+msgstr " $ apt-cache search --names-only ^task-\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:118
msgid ""
-"The default location for the list files on your system is #{/usr/share/live/"
-"build/package-lists/}#. To determine the packages in a given list, read the "
-"corresponding file, paying attention to included files and conditionals as "
-"described in the following sections."
+"In addition to these, you will find other metapackages with various "
+"purposes. Some are subsets of broader task packages, like #{gnome-core}#, "
+"while others are individual specialized parts of a Debian Pure Blend, such "
+"as the #{education-*}# metapackages. To list all metapackages in the "
+"archive, install the #{debtags}# package and list all packages with the #"
+"{role::metapackage}# tag as follows:"
msgstr ""
-"L'emplacement par défaut pour les fichiers liste sur votre système est #{/"
-"usr/share/live/build/package-lists/}#. Pour déterminer les paquets dans une "
-"liste donnée, lire le fichier correspondant, en accordant une attention aux "
-"fichiers inclus et les conditionnels tels que décrits dans les sections "
-"suivantes."
+"En plus, vous trouverez d'autres métapaquets à des fins diverses. Certains "
+"sont sous-ensembles de paquets de tâches plus larges, comme #{gnome-core}#, "
+"tandis que d'autres sont pièces individuelles spécialisées d'un Debian Pure "
+"Blend, comme les métapaquets #{education-*}#. Pour lister tous les "
+"métapaquets dans l'archive, installer le paquet #{debtags}# et lister tous "
+"les paquets avec le tag #{role::metapackage}# comme suit:"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:122
+#, no-wrap
+msgid " $ debtags search role::metapackage\n"
+msgstr " $ debtags search role::metapackage\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr "3~ Listes de paquets locaux"
#. type: Plain text
-#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:128
msgid ""
-"You may supplement the predefined lists using local package lists stored in #"
-"{config/package-lists/}#."
+"Whether you list metapackages, individual packages, or a combination of "
+"both, all local package lists are stored in #{config/package-lists/}#. Since "
+"more than one list can be used, this lends itself well to modular designs. "
+"For example, you may decide to devote one list to a particular choice of "
+"desktop, another to a collection of related packages that might as easily be "
+"used on top of a different desktop. This allows you to experiment with "
+"different combinations of sets of packages with a minimum of fuss, sharing "
+"common lists between different live image projects."
msgstr ""
-"Vous pouvez compléter ou remplacer entièrement les listes fournies en "
-"utilisant listes de paquets locaux stockées dans #{config/package-lists/}#."
+"Si vous ajoutez métapaquets dans une liste, des paquets individuels ou une "
+"combinaison des deux, toutes les listes de paquets locaux sont stockées dans "
+"#{config/package-lists/}#. Comme plus d'une liste peut être utilisée, cela "
+"se prête bien à une conception modulaire. Par exemple, vous pouvez décider "
+"de consacrer une liste à un choix particulier de bureau, l'autre à une "
+"collection de packages connexes qui pourraient aussi bien être utilisés au-"
+"dessus d'un bureau différent. Cela vous permet d'expérimenter avec "
+"différentes combinaisons d'ensembles de paquets avec un minimum de tracas en "
+"utilisant des listes communes entre les différents projets d'images live."
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -592,18 +659,18 @@ msgstr ""
"destinée."
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:132
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr "*{Remarque:}* Si vous ne spécifiez pas le suffixe de l'étape, la liste sera utilisée pour les deux étapes. Normalement, vous voulez spécifier #{.list.chroot}# de sorte que les paquets seront seulement installés dans le système de fichiers live et ne pas avoir une copie supplémentaire des #{.deb}# placée sur le support.\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:134
msgid "3~ Local binary package lists"
msgstr "3~ Listes locaux de paquets binaires"
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:136
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -621,48 +688,58 @@ msgstr ""
"chroot, utilisez simplement le suffixe #{.list}#. "
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "3~ Extending a provided package list using includes"
-msgstr "3~ Extension d'un liste de paquets fournis à l'aide de «includes»"
+#: en/user_customization-packages.ssi:138
+msgid "3~generated-package-lists Generated package lists"
+msgstr "3~generated-package-lists Générer listes de paquets"
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:140
msgid ""
-"The package lists that are included with live-build make extensive use of "
-"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
-"directory, as they serve as good examples of how to write your own 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 "
+"command to be executed within the chroot when the image is built. For "
+"example, one might include the line #{! grep-aptavail -n -sPackage -"
+"FPriority standard | sort}# in a package list to produce a sorted list of "
+"available packages with #{Priority: standard}#."
msgstr ""
-"Les listes de paquets qui sont incluses avec live-build font un grand usage "
-"des «includes». Reportez-vous à celles-ci dans le répertoire #{/usr/share/"
-"live/build/package-lists/}#, car elles servent d'exemples pour savoir "
-"comment écrire vos propres listes."
+"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 "
+"indique une commande à exécuter dans le chroot lorsque l'image est "
+"construite. Par exemple, on pourrait inclure la ligne #{! grep-aptavail -n -"
+"sPackage -FPriority standard | sort}# dans une liste de paquets qui permet "
+"de produire une liste triée des paquets disponibles avec"
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:142
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list "
-"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
-"following contents:"
+"In fact, selecting packages with the #{grep-aptavail}# command (from the #"
+"{dctrl-tools}# package) is so useful that #{live-build}# provides a #"
+"{Packages}# helper script as a convenience. This script takes two arguments: "
+"#{field}# and #{pattern}#. Thus, you can create a list with the following "
+"contents:"
msgstr ""
-"Par exemple, pour faire une liste qui comprend la liste prédéfinie #{gnome}"
-"#, plus /{iceweasel}/, créer #{config/package-lists/my.list.chroot}# avec le "
-"contenu suivant:"
+"En fait, la sélection des paquets avec la commande #{grep-aptavail}# (du "
+"paquet #{dctrl-tools}#) est si utile que #{live-build}# fournit un script #"
+"{Packages}# à titre de commodité. Ce script accepte deux arguments: #{field}"
+"# et #{pattern}#. Ainsi, vous pouvez créer une liste avec le contenu suivant:"
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
-" #include <gnome>\n"
-" iceweasel\n"
+" $ lb config\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
msgstr ""
+" $ lb config\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr "3~ Utilisant des conditionnels dans les listes de paquets"
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -680,7 +757,7 @@ msgstr ""
"# ou #{ARCHIVE_AREAS}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
@@ -689,16 +766,19 @@ msgstr ""
"spécifié:"
#. type: Plain text
-#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
" ia32-libs\n"
" #endif\n"
msgstr ""
+" #if ARCHITECTURES amd64\n"
+" ia32-libs\n"
+" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:165
msgid ""
"You may test for any one of a number of values, e.g. to install /"
"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
@@ -709,16 +789,19 @@ msgstr ""
"amd64}# est spécifié:"
#. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURES i386 amd64\n"
" memtest86+\n"
" #endif\n"
msgstr ""
+" #if ARCHITECTURES i386 amd64\n"
+" memtest86+\n"
+" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:175
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
@@ -729,86 +812,46 @@ msgstr ""
"free}# est spécifié via #{--archive-areas}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
" vrms\n"
" #endif\n"
msgstr ""
+" #if ARCHIVE_AREAS contrib non-free\n"
+" vrms\n"
+" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr "Un conditionnel peut entourer une directive #{#include}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
" #include <gnome-full>\n"
" #endif\n"
msgstr ""
+" #if ARCHITECTURES amd64\n"
+" #include <gnome-full>\n"
+" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr "L'imbrication des conditionnels n'est pas soutenu."
#. type: Plain text
-#: en/user_customization-packages.ssi:180
-msgid "3~ Tasks"
-msgstr "3~ Tâches"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid ""
-"The Debian Installer offers the user choices of a number of preselected "
-"lists of packages, each one focused on a particular kind of system, or task "
-"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
-"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
-"by APT through the \"Task:\" field. You can specify one or more tasks in "
-"live-build by putting them in a list in #{config/task-lists/}#, as in the "
-"example below."
-msgstr ""
-"L'installateur Debian offre l'utilisateur le choix d'un certain nombre de "
-"listes présélectionnées de paquets, chacune centrée sur un type particulier "
-"de système ou d'une tâche pour laquelle un système peut être utilisé, comme "
-"«environnement de bureau graphique», «serveur de messagerie» ou «portable». "
-"Ces listes sont appelés «tâches» (Tasks) et sont soutenues par APT grâce à "
-"l'option «Task:» Vous pouvez spécifier une ou plusieurs tâches à live-build "
-"en les plaçant dans une liste dans #{config/task-lists/}#, comme dans "
-"l'exemple ci-dessous."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:187
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:191
-msgid ""
-"The primary tasks available in the Debian Installer can be listed with #"
-"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including the ones not included in this list, may be examined with #{tasksel "
-"--task-packages}#."
-msgstr ""
-"Les tâches principales disponibles dans l'installateur Debian peuvent être "
-"listées avec #{tasksel --list-tasks}# dans le système live. Le contenu de "
-"n'importe quelle tâche, y compris celles non incluses dans cette liste, "
-"peuvent être examinées avec #{tasksel --task-packages}#."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:197
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr "3~desktop-and-language-tasks Tâches de bureau et de la langue"
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:199
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -831,7 +874,7 @@ msgstr ""
"l'installation influence le choix des tâches de la langue correspondante."
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:201
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -850,13 +893,20 @@ msgstr ""
"défaut de live-build."
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:203
+#, fuzzy
+#| msgid ""
+#| "Because there is no provision made automatically for language tasks, "
+#| "which include such things as language-specific fonts and input-method "
+#| "packages, if you want them, you need to specify them in your "
+#| "configuration. For example, a GNOME desktop image containing support for "
+#| "Japanese might include these tasks:"
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
"you want them, you need to specify them in your configuration. For example, "
"a GNOME desktop image containing support for Japanese might include these "
-"tasks:"
+"task metapackages:"
msgstr ""
"Parce qu'il n'y a pas aucune disposition faite automatiquement pour les "
"tâches de la langue, qui comprennent des éléments tels que des polices "
@@ -866,47 +916,23 @@ msgstr ""
"les tâches suivantes:"
#. type: Plain text
-#: en/user_customization-packages.ssi:205
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
-" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:209
-msgid ""
-"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value, if it differs from the "
-"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
-"variable or else tasksel will not recognize and install it. Thus:"
-msgstr ""
-"Comme les tâches de bureau sont des tâches «internes», pour chaque tâche de "
-"saveur de bureau incluse dans l'image, la valeur correspondante, si elle "
-"diffère de la valeur par défaut, \"gnome\", doit être préconfigurée dans la "
-"variable debconf «tasksel/desktop\", ou bien tasksel ne la reconnaîtra pas "
-"et ne l'installera pas. Ainsi:"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:214
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ lb config\n"
+#| " $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+#| " $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
msgid ""
" $ lb config\n"
-" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:218
-msgid ""
-"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
-"\"."
+" $ echo \"task-gnome-desktop task-laptop\" >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-japanese task-japanese-desktop task-japanese-gnome-desktop\" >> config/package-lists/my.list.chroot\n"
msgstr ""
-"Ce paramètre peut prendre plusieurs valeurs, par exemple \"lxde xfce\" au "
-"lieu de \"kde\"."
+" $ lb config\n"
+" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
+" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:213
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
@@ -915,7 +941,7 @@ msgstr ""
"modifiés ou de tiers"
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:215
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -933,7 +959,7 @@ msgstr ""
"ajouter des fonctionnalités sur mesure et/ou propriétaires."
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:217
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -950,22 +976,22 @@ msgstr ""
"org/doc/maint-guide/ et ailleurs"
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:219
msgid "There are two ways of installing modified custom packages:"
msgstr "Il y a deux façons d'installer des paquets personnalisés modifiés:"
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:221
msgid "_* #{packages.chroot}#"
msgstr "_* #{packages.chroot}#"
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:223
msgid "_* Using a custom APT repository"
msgstr "_* Utiliser un dépôt APT personnalisé"
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:225
msgid ""
"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
"customizations but has a number of drawbacks, whilst using a custom APT "
@@ -976,12 +1002,12 @@ msgstr ""
"en utilisant un dépôt personnalisé APT est plus fastidieux à mettre en place."
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:227
msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr "3~ Utilisant #{packages.chroot}# pour installer paquets personnalisés"
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:229
msgid ""
"To install a custom package, simply copy it to the #{config/packages.chroot/}"
"# directory. Packages that are inside this directory will be automatically "
@@ -994,7 +1020,7 @@ msgstr ""
"construction du systéme - vous n'avez pas besoin de les spécifier ailleurs."
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:231
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
@@ -1003,7 +1029,7 @@ msgstr ""
"simple de le faire consiste à utiliser #{dpkg-name}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:233
msgid ""
"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
@@ -1012,12 +1038,12 @@ msgstr ""
"personnalisés a des inconvénients:"
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:235
msgid "_* It is not possible to use secure APT."
msgstr "_* Il n'est pas possible d'utiliser secure APT."
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:237
msgid ""
"_* You must install all appropriate packages in the #{config/packages."
"chroot/}# directory."
@@ -1026,7 +1052,7 @@ msgstr ""
"{config/packages.chroot/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:239
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
@@ -1035,12 +1061,12 @@ msgstr ""
"contrôle de révision."
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:241
msgid "3~ Using an APT repository to install custom packages"
msgstr "3~ Utiliser un dépôt APT pour installer des paquets personnalisés."
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:243
msgid ""
"Unlike using #{packages.chroot}#, when using a custom APT repository you "
"must ensure that you specify the packages elsewhere. See {Choosing packages "
@@ -1052,7 +1078,7 @@ msgstr ""
"to-install pour plus de détails."
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:245
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -1063,12 +1089,12 @@ msgstr ""
"date ultérieure pour offrir les mises à jour des paquets modifiés."
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:247
msgid "3~ Custom packages and APT"
msgstr "3~ Les paquets personnalisés et APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:249
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -1083,7 +1109,7 @@ msgstr ""
"APT choisira d'installer le paquet avec la numéro de version supérieur."
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:251
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -1099,12 +1125,12 @@ msgstr ""
"plus d'informations."
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:253
msgid "2~ Configuring APT at build time"
msgstr "2~ Configuration d'APT au moment de la construction"
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:255
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -1121,12 +1147,12 @@ msgstr ""
"options commençant par #{apt}# dans la page de manuel de #{lb_config}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:257
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr "3~choosing-apt-or-aptitude Choisir apt ou aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:259
msgid ""
"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -1140,7 +1166,7 @@ msgstr ""
"différence notable étant la manière dont les paquets manquants sont traités."
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:261
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
@@ -1149,7 +1175,7 @@ msgstr ""
"l'installation va échouer. C'est le réglage par défaut."
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:263
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
@@ -1158,12 +1184,12 @@ msgstr ""
"l'installation va réussir."
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:265
msgid "3~ Using a proxy with APT"
msgstr "3~ Utilisation d'un proxy avec APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:267
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -1175,18 +1201,20 @@ msgstr ""
"nécessaire, par exemple"
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:271
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
-msgstr ""
+msgstr " $ lb config --apt-http-proxy http://proxy/\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:282
-msgid "3~ Tweaking APT to save space"
+#: en/user_customization-packages.ssi:275
+#, fuzzy
+#| msgid "3~ Tweaking APT to save space"
+msgid "3~tweaking-apt-to-save-space Tweaking APT to save space"
msgstr "3~ Régler APT pour économiser de l'espace"
#. type: Plain text
-#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:277
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -1197,7 +1225,7 @@ msgstr ""
"d'intérêt."
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:279
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
@@ -1206,13 +1234,13 @@ msgstr ""
"pouvez omettre avec:"
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:283
#, no-wrap
msgid " $ lb config --apt-indices false\n"
-msgstr ""
+msgstr " $ lb config --apt-indices false\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:287
msgid ""
"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
@@ -1228,34 +1256,66 @@ msgstr ""
"créer ces indices."
#. type: Plain text
-#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:289
+#, fuzzy
+#| msgid ""
+#| "If you find the installation of recommended packages bloats your image "
+#| "too much, you may disable that default option of APT with:"
msgid ""
"If you find the installation of recommended packages bloats your image too "
-"much, you may disable that default option of APT with:"
+"much, provided you are prepared to deal with the consequences discussed "
+"below, you may disable that default option of APT with:"
msgstr ""
"Si vous trouvez que l'installation des paquets recommandés gonfle votre "
"image trop, vous pouvez désactiver l'option par défaut d'APT avec:"
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:293
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:304
-msgid ""
-"The tradeoff here is that if you don't install recommended packages for a "
-"given package, that is, \"packages that would be found together with this "
-"one in all but unusual installations\" (Debian Policy Manual, section 7.2), "
-"some packages that you actually need may be omitted. Therefore, we suggest "
-"you review the difference turning off recommends makes to your packages list "
-"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
-"in your list any missing packages that you still want installed. "
-"Alternatively, if you find you only want a small number of recommended "
-"packages left out, leave recommends enabled and set a negative APT pin "
-"priority on selected packages to prevent them from being installed, as "
-"explained in {APT pinning}#apt-pinning."
+msgstr " $ lb config --apt-recommends false\n"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:297
+msgid ""
+"The most important consequence of turning off recommends is that #{live-boot}"
+"# and #{live-config}# themselves recommend some packages that provide "
+"important functionality used by most Live configurations, such as #{user-"
+"setup}# which #{live-config}# recommends and is used to create the live "
+"user. In all but the most exceptional circumstances you need to add back at "
+"least some of these recommends to your package lists or else your image will "
+"not work as expected, if at all. Look at the recommended packages for each "
+"of the #{live-*}# packages included in your build and if you are not certain "
+"you can omit them, add them back into your package lists."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:299
+#, fuzzy
+#| msgid ""
+#| "The tradeoff here is that if you don't install recommended packages for a "
+#| "given package, that is, \"packages that would be found together with this "
+#| "one in all but unusual installations\" (Debian Policy Manual, section "
+#| "7.2), some packages that you actually need may be omitted. Therefore, we "
+#| "suggest you review the difference turning off recommends makes to your "
+#| "packages list (see the #{binary.packages}# file generated by #{lb build}"
+#| "#) and re-include in your list any missing packages that you still want "
+#| "installed. Alternatively, if you find you only want a small number of "
+#| "recommended packages left out, leave recommends enabled and set a "
+#| "negative APT pin priority on selected packages to prevent them from being "
+#| "installed, as explained in {APT pinning}#apt-pinning."
+msgid ""
+"The more general consequence is that if you don't install recommended "
+"packages for any given package, that is, \"packages that would be found "
+"together with this one in all but unusual installations\" (Debian Policy "
+"Manual, section 7.2), some packages that users of your Live system actually "
+"need may be omitted. Therefore, we suggest you review the difference turning "
+"off recommends makes to your packages list (see the #{binary.packages}# file "
+"generated by #{lb build}#) and re-include in your list any missing packages "
+"that you still want installed. Alternatively, if you find you only want a "
+"small number of recommended packages left out, leave recommends enabled and "
+"set a negative APT pin priority on selected packages to prevent them from "
+"being installed, as explained in {APT pinning}#apt-pinning."
msgstr ""
"La contrepartie ici est que si vous n'installez pas les paquets recommandés "
"par un paquet, c’est-à-dire, \"paquets qu'on trouverai avec celui-ci dans "
@@ -1271,12 +1331,12 @@ msgstr ""
"pinning}#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:301
msgid "3~ Passing options to apt or aptitude"
msgstr "3~ Passer des options à apt ou aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:303
msgid ""
"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1289,12 +1349,12 @@ msgstr ""
"les pages de manuel #{apt}# et #{aptitude}# pour plus de détails"
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:305
msgid "3~apt-pinning APT pinning"
msgstr "3~apt-pinning APT pinning"
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:307
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1308,7 +1368,7 @@ msgstr ""
"etc/apt/preferences}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:309
msgid ""
"Let's say you are building a wheezy live system but need all the live "
"packages that end up in the binary image to be installed from sid at build "
@@ -1325,7 +1385,7 @@ msgstr ""
"cible, wheezy. Ce qui suit devrait accomplir ça:"
#. type: Plain text
-#: en/user_customization-packages.ssi:322
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
@@ -1334,9 +1394,14 @@ msgid ""
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << END\n"
+" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 600\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" Package: *\n"
@@ -1344,45 +1409,53 @@ msgid ""
" Pin-Priority: 1\n"
" END\n"
msgstr ""
+" Package: *\n"
+" Pin: release n=sid\n"
+" Pin-Priority: 1\n"
+" END\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:326
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
msgstr "*{Remarque:}* Caractères génériques peuvent être utilisés dans les noms des paquets (par exemple *{Package: live-*}*) avec la version 0.8.14 ou supérieure d'Apt. Cela signifie qu'il fonctionne avec wheezy en utilisant:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:330
msgid "$ lb config --distribution wheezy"
-msgstr ""
+msgstr "$ lb config --distribution wheezy"
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:334
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
-"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
-"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
-"{gnome-keyring}/ package. This can be done by adding the following stanza to "
-"#{config/chroot_apt/preferences}#:"
+"package. Suppose you are building an LXDE image using #{task-lxde-desktop}# "
+"in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the "
+"user prompted to store wifi passwords in the keyring. This metapackage "
+"depends on /{lxde-core}/, which recommends /{gksu}/, which in turn "
+"recommends /{gnome-keyring}/. So you want to omit the recommended /{gnome-"
+"keyring}/ package. This can be done by adding the following stanza to #"
+"{config/chroot_apt/preferences}#:"
msgstr ""
"Une priorité pin négative évitera installér un paquet, comme dans le cas où "
"vous ne voulez pas un paquet qui est recommandé par un autre paquet. "
-"Supposons que vous construisez une image LXDE en utilisant l'option #{--"
-"package-lists lxde}# mais ne veulez pas que l'utilisateur soit invité à "
-"stocker les mots de passe wifi dans le trousseau de clés. Cette liste "
-"comprend /{gdm}/, que dépend de /{gksu}/, que à son tour recommande /{gnome-"
-"keyring}/. Donc, vous voulez omettre le paquet recommandé /{gnome-keyring}/. "
-"Cela peut être fait en ajoutant la strophe suivante à #{config/chroot_apt/"
-"preferences}#:"
+"Supposons que vous construisez une image LXDE en utilisant #{task-lxde-"
+"desktop}# dans #{config/package-lists/lxde-desktop.list.chroot}# mais ne "
+"veulez pas que l'utilisateur soit invité à stocker les mots de passe wifi "
+"dans le trousseau de clés. Cette liste comprend /{lxde-core}/, qui "
+"recommande /{gksu}/, que à son tour recommande /{gnome-keyring}/. Donc, vous "
+"voulez omettre le paquet recommandé /{gnome-keyring}/. Cela peut être fait "
+"en ajoutant la strophe suivante à #{config/chroot_apt/preferences}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:345
+#: en/user_customization-packages.ssi:340
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
" Pin: version *\n"
" Pin-Priority: -1\n"
msgstr ""
+" Package: gnome-keyring\n"
+" Pin: version *\n"
+" Pin-Priority: -1\n"
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index 1007262..687fd9a 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -1,20 +1,19 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
-"PO-Revision-Date: 2012-07-21 00:01+0200\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"POT-Creation-Date: 2012-07-27 21:48+0300\n"
+"PO-Revision-Date: 2012-08-07 15:05+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -225,6 +224,10 @@ msgid ""
" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
" >> config/preseed/my.preseed.chroot\n"
msgstr ""
+" $ lb config\n"
+" $ echo user-setup passwd/user-default-groups string audio cdrom \\\n"
+" dip floppy video plugdev netdev powerdev scanner bluetooth fuse \\\n"
+" >> config/preseed/my.preseed.chroot\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:23
@@ -249,7 +252,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:29
#, no-wrap
msgid " $ lb config --bootappend-live \"username=live-user\"\n"
-msgstr ""
+msgstr " $ lb config --bootappend-live \"username=live-user\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:33
@@ -305,7 +308,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
-msgstr ""
+msgstr " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:51
@@ -335,8 +338,8 @@ msgstr ""
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 "
+"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:"
@@ -344,7 +347,7 @@ msgstr ""
"La configuration du clavier pour la console et pour X est faite par #{live-"
"config}# en utilisant le paquet #{console-setup}#. Pour les configurer, "
"utiliser les paramètres de démarrage #{keyboard-layouts}#, #{keyboard-"
-"variant}#, #{keyboard-options}# et #{keyboard-model}# avec l'option #{--"
+"variants}#, #{keyboard-options}# et #{keyboard-model}# avec l'option #{--"
"bootappend-live}#. On peut trouver options valides dans #{/usr/share/X11/xkb/"
"rules/base.lst}#. Pour trouver les dispositions el les variantes "
"correspondantes à une langue essayez de rechercher le nom anglais de la "
@@ -365,6 +368,16 @@ msgid ""
" de_mac ch: German (Switzerland, Macintosh)\n"
" ! option\n"
msgstr ""
+"$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst\n"
+" ! model\n"
+" ! layout\n"
+" ch German (Switzerland)\n"
+" ! variant\n"
+" legacy ch: German (Switzerland, legacy)\n"
+" de_nodeadkeys ch: German (Switzerland, eliminate dead keys)\n"
+" de_sundeadkeys ch: German (Switzerland, Sun dead keys)\n"
+" de_mac ch: German (Switzerland, Macintosh)\n"
+" ! option\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:72
@@ -387,7 +400,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:78
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
-msgstr ""
+msgstr " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
# Notes:
# Add Note
@@ -412,8 +425,10 @@ msgstr ""
#, no-wrap
msgid ""
" $ 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"
msgstr ""
+" $ lb config --bootappend-live \\\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
@@ -422,28 +437,30 @@ msgid ""
"{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:"
+"# 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:"
msgstr ""
"Plusieurs valeurs peuvent être spécifiées séparées par des virgules pour "
"chacune des options #{keyboard-*}#, à l'exception de #{keyboard-model}#, qui "
"accepte une seule valeur. S'il vous plaît voir la page de manuel #{keyboard"
"(5)}# pour plus de détails et des exemples des variables #{XKBMODEL}#, #"
"{XKBLAYOUT}#, #{XKBVARIANT}# et #{XKBOPTIONS}#. Si plusieurs valeurs #"
-"{keyboard-variant}# sont données, elles seront jumelées tête à tête avec les "
-"valeurs #{keyboard-layouts}# voir #{setxkbmap(1)}# option #{-variant}#). On "
-"peut utiliser des valeurs vides; par exemple pour regler deux dispositions, "
-"une par défaut US QWERTY et l'autre US Dvorak, utiliser:"
+"{keyboard-variants}# sont données, elles seront jumelées tête à tête avec "
+"les valeurs #{keyboard-layouts}# voir #{setxkbmap(1)}# option #{-variant}#). "
+"On peut utiliser des valeurs vides; par exemple pour regler deux "
+"dispositions, une par défaut US QWERTY et l'autre US Dvorak, utiliser:"
#. type: Plain text
#: en/user_customization-runtime.ssi:96
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
msgstr ""
+" $ lb config --bootappend-live \\\n"
+" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:100
@@ -579,7 +596,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:124
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
-msgstr ""
+msgstr " # mkfs.ext4 -L persistence /dev/sdb1\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:128
@@ -601,7 +618,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:134
#, no-wrap
msgid " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
-msgstr ""
+msgstr " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:138
@@ -619,6 +636,8 @@ msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
" $ /sbin/mkfs.ext4 -F persistence\n"
msgstr ""
+" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
+" $ /sbin/mkfs.ext4 -F persistence\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:147
@@ -668,6 +687,10 @@ msgid ""
" # echo \"/home\" >> /mnt/live-persistence.conf\n"
" # echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
msgstr ""
+" # mkfs.ext4 -L persistence /dev/sdb1\n"
+" # mount -t ext4 /dev/sdb1 /mnt\n"
+" # echo \"/home\" >> /mnt/live-persistence.conf\n"
+" # echo \"/var/cache/apt\" >> /mnt/live-persistence.conf\n"
#. type: Plain text
#: en/user_customization-runtime.ssi:164
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 54cf444..1252aaf 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -1,20 +1,20 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-19 03:36+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"
+"POT-Creation-Date: 2012-08-10 22:48+0300\n"
+"PO-Revision-Date: 2012-08-08 00:13+0100\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/live-manual.ssm:61 en/user_examples.ssi:2
@@ -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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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,80 +113,81 @@ 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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:266
#, 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 ""
+msgstr " $ lb config\n"
#. 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:235
#, no-wrap
msgid " # lb build\n"
-msgstr ""
+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 ""
+msgstr " #!/bin/sh\n"
#. type: Plain text
#: en/user_examples.ssi:4
@@ -255,6 +257,9 @@ msgid ""
" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
msgstr ""
+" LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\"\n"
+" LB_MIRROR_CHROOT_SECURITY=\"http://mirror/debian-security\"\n"
+" LB_MIRROR_CHROOT_BACKPORTS=\"http://mirror/debian-updates\"\n"
#. type: Plain text
#: en/user_examples.ssi:22
@@ -288,7 +293,7 @@ msgstr "Vous ne pouvez pas obtenir rien plus simple que cela:"
#: en/user_examples.ssi:32
#, no-wrap
msgid " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
-msgstr ""
+msgstr " $ mkdir tutorial1 ; cd tutorial1 ; lb config\n"
#. type: Plain text
#: en/user_examples.ssi:36
@@ -353,17 +358,19 @@ msgstr ""
"Debian 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 ""
+" $ 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 "
@@ -381,7 +388,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 +397,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,37 +433,43 @@ 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"
" $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/\n"
" $ cd tutorial3\n"
msgstr ""
+" $ mkdir -p tutorial3/auto\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/\n"
+" $ cd tutorial3\n"
#. 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 ""
+" lb config noauto \\\n"
+" --architectures i386 \\\n"
+" --linux-flavours 686-pae \\\n"
+" \"${@}\"\n"
#. 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,42 +478,42 @@ 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
+#: 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 ""
"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 "
+"construction #{amd64}#, nous construisons une version de 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 "
+"choisi la tâche métapaquet /{lxde}/ pour nous donner un bureau minimal. Et "
"enfin, nous avons ajouté deux premiers paquets préférés: /{iceweasel}/ et /"
"{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 +523,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,21 +535,24 @@ 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"
" $ git add auto\n"
" $ git commit -a -m \"Initial import.\"\n"
msgstr ""
+" $ git init\n"
+" $ git add auto\n"
+" $ git commit -a -m \"Initial import.\"\n"
#. 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 +562,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 +576,13 @@ msgstr ""
"configuration."
#. type: Plain text
-#: en/user_examples.ssi:151
+#: en/user_examples.ssi:149
#, no-wrap
msgid " # lb clean\n"
-msgstr ""
+msgstr " # lb clean\n"
#. 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 +591,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 ""
+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 "Construire à nouveau:"
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:165
msgid "# lb build"
-msgstr ""
+msgstr "# lb build"
#. 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 ""
+msgstr " $ git commit -a -m \"Adding vlc media player.\"\n"
#. 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 +636,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,160 +652,256 @@ 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
+#, fuzzy
+#| msgid ""
+#| "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}/."
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 initial "
+"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:"
+"Créez un répertoire de construction et créez une configuration du squelette "
+"à l'intérieur, désactiver «recommends» pour faire un système minimal. Et "
+"puis créer deux listes de paquets: la première généré par un script fourni "
+"par live-build nommée {Packages}# (voir {Générer listes de paquets}"
+"#generated-package-lists), et la seconde incluant /{xorg}/, /{gdm3}/, /"
+"{metacity}/ et /{xvnc4viewer}/."
#. 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 ""
+" $ mkdir vnc_kiosk_client\n"
+" $ cd vnc_kiosk_client\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"
+
+#. type: Plain text
+#: en/user_examples.ssi:197
+msgid ""
+"As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you "
+"may need to re-add some recommended packages to make your image work "
+"properly."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:199
+msgid "An easy way to list recommends is using /{apt-cache}/. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:203
+#, no-wrap
+msgid " $ apt-cache depends live-config live-boot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
+msgid ""
+"In this example we found out that we had to re-include several packages "
+"recommended by live-config and live-boot: #{user-setup}# to make autologin "
+"work and #{sudo}# as an essential program to shutdown the system. Besides, "
+"it could be handy to add #{live-tools}# to be able to copy the image to RAM "
+"and #{eject}# to eventually eject the live media, So:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:211
+#, fuzzy
+#| msgid ""
+#| " $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my."
+#| "list.chroot\n"
+msgid ""
+"$ echo \"live-tools user-setup sudo eject\" > config/package-lists/"
+"recommends.list.chroot"
+msgstr ""
+" $ echo \"task-lxde-desktop iceweasel xchat\" >> config/package-lists/my."
+"list.chroot\n"
+
+#. type: Plain text
+#: en/user_examples.ssi:215
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}#:"
+"Créez le répertoire #{/etc/skel}# dans #{config/includes.chroot}# avec un "
+"fichier #{.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:221
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
" #!/bin/sh\n"
msgstr ""
+" $ mkdir -p config/includes.chroot/etc/skel\n"
+" $ cat > config/includes.chroot/etc/skel/.xsession << END\n"
+" #!/bin/sh\n"
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:224
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
" /usr/bin/xvncviewer 192.168.1.2:1\n"
msgstr ""
+" /usr/bin/metacity &\n"
+" /usr/bin/xvncviewer 192.168.1.2:1\n"
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:227
#, no-wrap
msgid ""
" exit\n"
" END\n"
msgstr ""
+" exit\n"
+" END\n"
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:231
msgid "Build the image:"
msgstr "Construire l'image:"
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:239
msgid "Enjoy."
msgstr "Amusez-vous bien!"
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:241
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
+#: en/user_examples.ssi:243
#, 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"
-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"
+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 un peu d'espace laissé pour l'utiliser à votre convenance.\n"
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:245
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."
-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 "
-"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é."
-
-#. type: Plain text
-#: en/user_examples.ssi:234
+"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 de 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\". Afin de comprendre "
+"ce que le hook #{minimal.chroot}# fait, voir #{/usr/share/doc/live-build/"
+"examples/hooks}#"
+
+#. type: Plain text
+#: en/user_examples.ssi:250
#, 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 ""
+" $ 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"
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:254
+msgid ""
+"To make the image work properly, we must re-add, at least, two recommended "
+"packages which are left out by the #{--apt-recommends false}# option. See "
+"{Tweaking APT to save space}#tweaking-apt-to-save-space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:258
+#, fuzzy, no-wrap
+#| msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
+msgid " $ echo \"user-setup sudo\" > config/package-lists/recommends.list.chroot\n"
+msgstr " $ echo vlc >> config/package-lists/my.list.chroot\n"
+
+#. type: Plain text
+#: en/user_examples.ssi:262
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:270
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 "
-"l'image de 166Mbyte produite par la configuration par défaut dans {Tutoriel "
+"dessus produisait une image de 95Mbyte. Cela se compare favorablement avec "
+"l'image de 182Mbyte produite par la configuration par défaut dans {Tutoriel "
"1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:272
+#, 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. 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."
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."
+"chroot}# 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 "
@@ -802,24 +914,38 @@ msgstr ""
"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é."
+"certains supports matériels. #{--memtest none}# prévient l'installation d'un "
+"testeur de mémoire. Et enfin, l'exécution du hook #{minimal}# supprime "
+"certains paquets et fichiers qui ne sont pas utilisés ."
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:274
+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 ""
+"En utilisant d'autres hooks comme par exemple le hook #{stripped.chroot}# "
+"dans #{/usr/share/doc/live-build/examples/hooks}#, peut gagner de petites "
+"quantités supplémentaires d'espace et produire une image de 76MB. Mais c'est "
+"à vous de décider si la fonctionnalité qui est sacrifié à chaque "
+"optimisation de la taille vaut la perte de fonctionnalité."
+
+#. type: Plain text
+#: en/user_examples.ssi:276
msgid "2~ A localized KDE desktop and installer"
msgstr "2~ Un bureau KDE localisé et installateur "
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:278
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr "*{Cas d'utilisation:}* Créer une image de bureau KDE, localisée pour le portugais brésilien et incluant un installateur.\n"
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:280
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -830,7 +956,7 @@ msgstr ""
"qui seraient installés par l'installateur Debian standard pour KDE."
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:282
msgid ""
"Our initial problem is the discovery of the names of the appropriate "
"language tasks. Currently, live-build cannot help with this. While we might "
@@ -846,27 +972,29 @@ msgstr ""
"avez ces deux choses:"
#. type: Plain text
-#: en/user_examples.ssi:260
+#: en/user_examples.ssi:286
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
-msgstr ""
+msgstr " # apt-get install dctrl-tools tasksel-data\n"
#. type: Plain text
-#: en/user_examples.ssi:264
+#: en/user_examples.ssi:290
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
"Maintenant, nous pouvons rechercher les tâches appropriées, d'abord avec:"
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:295
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese\n"
msgstr ""
+" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
+" Task: brazilian-portuguese\n"
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:299
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
@@ -875,33 +1003,43 @@ msgstr ""
"clairement, brazilian-portuguese. Maintenant, pour trouver les tâches liées:"
#. type: Plain text
-#: en/user_examples.ssi:279
+#: en/user_examples.ssi:305
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
" Task: brazilian-portuguese-desktop\n"
" Task: brazilian-portuguese-kde-desktop\n"
msgstr ""
+" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
+" Task: brazilian-portuguese-desktop\n"
+" Task: brazilian-portuguese-kde-desktop\n"
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:309
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
-"latin1 keyboard layout. We will also need to preseed our desktop choice, "
-"\"kde\" so that tasksel will install the correct desktop task, as it differs "
-"from the default (see {Desktop and languages tasks}#desktop-and-language-"
-"tasks). Now let's put the pieces together:"
+"latin1 keyboard layout. Now let's put the pieces together. Recalling from "
+"{Using metapackages}#using-metapackages that task metapackages are prefixed #"
+"{task-}#, we just specify these language boot parameters, then add standard "
+"priority packages and all our discovered task metapackages to our package "
+"list as follows:"
msgstr ""
-"Au démarrage nous allons générer les paramètres régionaux pt_BR.UTF-8 et "
-"sélectionner la configuration du clavier pt-latin1. Nous aurons aussi besoin "
-"de préconfigurer notre choix de bureau, \"kde\" de sorte que tasksel "
-"installera la tâche de bureau correcte, car elle diffère de la valeur par "
-"défaut (Voir {Tâches de bureau et de la langue}#desktop-and-language-tasks). "
-"Maintenant, nous allons assembler les pièces:"
#. type: Plain text
-#: en/user_examples.ssi:297
-#, no-wrap
+#: en/user_examples.ssi:323
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ mkdir live-pt_BR-kde\n"
+#| " $ cd live-pt_BR-kde\n"
+#| " $ lb config \\\n"
+#| " -a i386 \\\n"
+#| " -k 486 \\\n"
+#| " --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
+#| " --debian-installer live\n"
+#| " $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+#| " brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
+#| " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+#| " $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgid ""
" $ mkdir live-pt_BR-kde\n"
" $ cd live-pt_BR-kde\n"
@@ -910,14 +1048,25 @@ msgid ""
" -k 486 \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \\\n"
+" task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot\n"
+msgstr ""
+" $ mkdir live-pt_BR-kde\n"
+" $ cd live-pt_BR-kde\n"
+" $ lb config \\\n"
+" -a i386 \\\n"
+" -k 486 \\\n"
+" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
+" --debian-installer live\n"
" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
-msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:300
+#: en/user_examples.ssi:326
msgid ""
"Note that we have included the debian-installer-launcher package to launch "
"the installer from the live desktop, and have also specified the 486 flavour "
diff --git a/manual/po/fr/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
index 84a7473..2113181 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -1,26 +1,26 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-16 18:50+0300\n"
-"PO-Revision-Date: 2012-03-17 20:00+0100\n"
-"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
-"Language-Team: <debian-live at lists.debian.org>\n"
+"POT-Creation-Date: 2012-08-08 13:49+0300\n"
+"PO-Revision-Date: 2012-08-08 15:41+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi: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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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,60 +108,61 @@ 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
-msgstr ""
+msgstr " $ lb config --archives live.debian.net\n"
#. type: Plain text
#: en/user_installation.ssi:2
@@ -194,8 +196,8 @@ msgstr "_* Une version mise à jour de live-build"
#. type: Plain text
#: en/user_installation.ssi:14
-msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
-msgstr "_* Un shell POSIX, tel que /{bash}/ ou /{dash}/."
+msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/"
+msgstr "_* Un shell POSIX, tel que /{bash}/ ou /{dash}/"
#. type: Plain text
#: en/user_installation.ssi:16
@@ -204,8 +206,8 @@ msgstr "_* /{debootstrap}/ ou /{cdebootstrap}/"
#. type: Plain text
#: en/user_installation.ssi:18
-msgid "_* Linux 2.6.x"
-msgstr "_* Linux 2.6.x"
+msgid "_* Linux 2.6.x or 3.x"
+msgstr "_* Linux 2.6.x ou 3.x"
#. type: Plain text
#: en/user_installation.ssi:20
@@ -267,7 +269,7 @@ msgstr "Il suffit d'installer live-build comme n'importe quel autre paquet:"
#: en/user_installation.ssi:40
#, no-wrap
msgid " # apt-get install live-build\n"
-msgstr ""
+msgstr " # apt-get install live-build\n"
#. type: Plain text
#: en/user_installation.ssi:44
@@ -278,7 +280,7 @@ msgstr "ou"
#: en/user_installation.ssi:48
#, no-wrap
msgid " # aptitude install live-build\n"
-msgstr ""
+msgstr " # aptitude install live-build\n"
#. type: Plain text
#: en/user_installation.ssi:52 en/user_installation.ssi:108
@@ -300,7 +302,7 @@ msgstr ""
#: en/user_installation.ssi:58
#, no-wrap
msgid " $ git clone git://live.debian.net/git/live-build.git\n"
-msgstr ""
+msgstr " $ git clone git://live.debian.net/git/live-build.git\n"
#. type: Plain text
#: en/user_installation.ssi:62
@@ -316,6 +318,9 @@ msgid ""
" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
" $ cd ..\n"
msgstr ""
+" $ cd live-build\n"
+" $ dpkg-buildpackage -rfakeroot -b -uc -us\n"
+" $ cd ..\n"
#. type: Plain text
#: en/user_installation.ssi:72
@@ -330,7 +335,7 @@ msgstr ""
#: en/user_installation.ssi:76
#, no-wrap
msgid " # dpkg -i live-build_2.0.8-1_all.deb\n"
-msgstr ""
+msgstr " # dpkg -i live-build_2.0.8-1_all.deb\n"
#. type: Plain text
#: en/user_installation.ssi:80
@@ -343,7 +348,7 @@ msgstr ""
#: en/user_installation.ssi:84
#, no-wrap
msgid " # make install\n"
-msgstr ""
+msgstr " # make install\n"
#. type: Plain text
#: en/user_installation.ssi:88
@@ -354,10 +359,10 @@ msgstr "et le désinstaller avec:"
#: en/user_installation.ssi:92
#, no-wrap
msgid " # make uninstall\n"
-msgstr ""
+msgstr " # make uninstall\n"
#. type: Plain text
-#: en/user_installation.ssi:96 en/user_installation.ssi:142
+#: en/user_installation.ssi:96 en/user_installation.ssi:149
msgid "3~ From 'snapshots'"
msgstr "3~ À partir des instantanés"
@@ -415,6 +420,8 @@ msgid ""
" $ git clone git://live.debian.net/git/live-boot.git\n"
" $ git clone git://live.debian.net/git/live-config.git\n"
msgstr ""
+" $ git clone git://live.debian.net/git/live-boot.git\n"
+" $ git clone git://live.debian.net/git/live-config.git\n"
#. type: Plain text
#: en/user_installation.ssi:121
@@ -469,32 +476,61 @@ msgid ""
" $ cd ../live-config\n"
" $ dpkg-buildpackage -b -uc -us\n"
msgstr ""
+" $ cd live-boot\n"
+" $ dpkg-buildpackage -b -uc -us\n"
+" $ cd ../live-config\n"
+" $ dpkg-buildpackage -b -uc -us\n"
#. type: Plain text
#: en/user_installation.ssi:138
-msgid "_* Use all generated .deb files"
-msgstr "_* Utilisez tous les fichiers .deb générés."
+msgid "_* Use applicable generated .deb files"
+msgstr "_* Utilisez les fichiers .deb générés nécessaires."
#. type: Plain text
#: en/user_installation.ssi:140
msgid ""
"As live-boot and live-config are installed by live-build system, installing "
"the packages in the host system is not sufficient: you should treat the "
-"generated .deb files like any other custom packages. Please see {Customizing "
-"package installation}#customizing-package-installation for more information. "
-"You should pay particular attention to {Additional repositories}#additional-"
-"repositories."
+"generated .deb files like any other custom packages. Since your purpose for "
+"building from source is like to test new things over the short term before "
+"the official release, follow {Installing modified or third-party packages}"
+"#installing-modified-or-third-party-packages to temporarily include the "
+"relevant files in your configuration. In particular, notice that both "
+"packages are divided into a generic part, a documentation part and one or "
+"more back-ends. Include the generic part, only one back-end matching your "
+"configuration, and optionally the documentation. Assuming you are building a "
+"live image in the current directory and have generated all .deb files for a "
+"single version of both packages in the directory above, these bash commands "
+"would copy all of the relevant packages including default back-ends:"
+msgstr ""
+"Comme live-boot and live-config sont installés par le système de "
+"construction live-build, l'installation de ces paquets dans le système hôte "
+"ne suffit pas: vous devez traiter les fichiers .deb générés comme d'autres "
+"paquets personnalisés. Comme votre objectif pour la construction à partir du "
+"code source est tester nouvelles choses à court terme avant la publication "
+"officielle, suivez {Installation de paquets modifiés ou de tiers}#installing-"
+"modified-or-third-party-packages pour inclure temporairement les pertinents "
+"dans votre configuration. En particulier, remarquez que les deux paquets "
+"sont divisés en une partie générique, une partie de documentation et un ou "
+"plusieurs back-ends. Inclure la partie générique, un seul back-end et "
+"éventuellement la documentation. En supposant que vous construisez une image "
+"live dans le répertoire courant et avez généré tous les fichiers .deb pour "
+"une version unique de deux paquets dans le répertoire ci-dessus, ces "
+"commandes bash seraient pour copier tous les paquets concernés, y compris "
+"par défaut les back-ends:"
+
+#. type: Plain text
+#: en/user_installation.ssi:145
+#, no-wrap
+msgid ""
+" $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/\n"
+" $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/\n"
msgstr ""
-"Comme live-boot et live-config sont installés par le système live-build, "
-"l'installation des paquets dans le système hôte ne suffit pas: vous devez "
-"traiter les fichiers .deb générés comme aucun autre paquet personnalisé. "
-"S'il vous plaît voir {Personnalisation de l'installation de paquets}"
-"#customizing-package-installation pour plus d'informations. Vous devriez "
-"prêter une attention particulière à {Dépôts additionnels}#additional-"
-"repositories."
+" $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/\n"
+" $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/\n"
#. type: Plain text
-#: en/user_installation.ssi:144
+#: en/user_installation.ssi:151
msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index e6d7934..0fe3001 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -1,26 +1,25 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-19 03:36+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"
+"POT-Creation-Date: 2012-08-07 13:47+0300\n"
+"PO-Revision-Date: 2012-08-07 23:44+0100\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi: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 +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{"
@@ -90,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
@@ -107,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"
@@ -179,175 +180,258 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:8
-msgid "2~ Use auto to manage configuration changes"
-msgstr "2~ Utiliser auto pour gérer les modifications de configuration"
+msgid "2~ Dealing with configuration changes"
+msgstr "2~ Traiter 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."
+"Les configurations live sont rarement parfaites du premier coup. Il peut "
+"être bon de passer des options #{lb config}# à partir de la ligne de "
+"commande pour effectuer une construction unique, mais il est plus typique de "
+"réviser ces options et de construire à nouveau jusqu'à ce que vous êtes "
+"satisfait. Afin de soutenir ces changements, vous aurez besoin des scripts "
+"automatiques qui assurent que votre configuration est maintenue dans un état "
+"cohérent."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
-msgid ""
-"For example, when the distribution is first set, many 'dependent' variables "
-"are given default values that suit that distribution. However, if you later "
-"decide to change the distribution, those dependent variables continue to "
-"retain old values that are no longer appropriate."
-msgstr ""
-"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."
+msgid "3~ Why use auto scripts? What do they do?"
+msgstr "3~ Pourquoi utiliser des scripts auto? Que font-ils?"
#. 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."
+"La commande #{lb config}# enregistre les options que vous lui passez dans "
+"les fichiers dans #{config/*}# avec beaucoup d'autres options aux valeurs "
+"par défaut. Si vous exécutez #{lb config}# à nouveau, il ne réinitialisera "
+"pas l'option qui a été faite défaut en fonction de vos options initiales. "
+"Ainsi, par exemple, si vous exécutez #{lb config}# à nouveau avec une "
+"nouvelle valeur pour #{--distribution}#, toutes les options qui ont été "
+"dépendantes par défaut pour l'ancienne distribution ne peuvent plus "
+"fonctionner avec les nouveaux. Ces fichiers ne sont pas destinés à être lus "
+"ou édités. Ils enregistrent des valeurs pour plus d'une centaine d'options, "
+"afin que personne puisse voir dans ces options que vous avez réellement "
+"précisée."
#. 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 ""
-"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)."
+"Pour toutes ces raisons, les scripts #{auto/*}# vous rendront la vie plus "
+"facile. Ils sont simples emballages pour les commandes #{lb config}#, #{lb "
+"build}# et #{lb clean}# qui sont conçus pour vous aider à gérer votre "
+"configuration. Le script #{auto/config}# enregistre votre commande #{lb "
+"config}# avec toutes les options désirées, le script #{auto/clean}# supprime "
+"les fichiers contenant les valeurs des variables de configuration, et le "
+"script #{auto/build}# crée un #{build.log}# de chaque construction. Et "
+"chaque fois que vous lancez la commande #{lb}# correspondante, ces fichiers "
+"seront exécutés automatiquement. En utilisant ces scripts, votre "
+"configuration est plus facile à lire et a une cohérence interne d'une "
+"révision à l'autre. En outre, il sera plus facile pour vous identifier et "
+"corriger les options qui doivent changer lorsque vous mettez à niveau live-"
+"build après avoir lu la documentation mise à jour."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
-msgid "2~ Example auto scripts"
-msgstr "2~ Exemples de scripts auto"
+msgid "3~ Use example auto scripts"
+msgstr "2~ Utilisez 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 ""
-"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/*}#)."
+"Pour votre commodité, live-build est fourni avec shell scripts d'exemple, "
+"pour copier et modifier. Lancer une nouvelle configuration par défaut, puis "
+"copier les exemples:"
#. 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 ""
+" $ mkdir mylive && cd mylive && lb config\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:29
+msgid "Edit #{auto/config}#, adding any options as you see fit. For instance:"
+msgstr ""
+"Modifier #{auto/config}#, ajouter des options comme bon vous semble. Par "
+"exemple:"
+
+#. 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 ""
+" #!/bin/sh\n"
+" lb config noauto \\\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"
#. 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 ""
+"Maintenant, chaque fois que vous utilisez #{lb config}#, #{auto/config}# "
+"réinitialisera la configuration basée sur ces options. Lorsque vous "
+"souhaitez effectuer des modifications, modifier les options dans ce fichier "
+"au lieu de les passer à #{lb config}#. Lorsque vous utilisez #{lb clean}#, #"
+"{auto/clean}# va nettoyer les fichiers ainsi que tous les autres produits de "
+"construction. Et enfin, lorsque vous utilisez #{lb build}# , un journal de "
+"la construction sera écrit par #{auto/build}# dans #{build.log}#."
#. 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 ""
+"Remarque: Un paramètre spécial #{noauto}# est utilisé ici pour en éliminer "
+"un autre appel à #{auto/config}#, évitant ainsi une récursion infinie. "
+"Assurez-vous que vous ne l'avez pas accidentellement supprimé modifiant le "
+"fichier. Aussi, prenez soin d'assurer quand vous divisez la commande #{lb "
+"config}# sur plusieurs lignes pour une meilleure lisibilité, comme le montre "
+"l'exemple ci-dessus, que vous n'oubliez pas la barre oblique inverse (\\) de "
+"sorte que chaque ligne continue à l'autre."
#. type: Plain text
-#: en/user_managing_a_configuration.ssi:45
-msgid "#{auto/build}#"
-msgstr ""
+#: en/user_managing_a_configuration.ssi:48
+msgid "2~ Clone a configuration published via Git"
+msgstr "2~ Cloner une configuration publiée via Git"
#. 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 ""
+"Utilisez l'option #{lb config --config}# pour cloner un dépôt Git qui "
+"contient une configuration de Debian Live. Si vous souhaitez baser votre "
+"configuration sur une maintenue par le projet Debian Live, voir les dépôts "
+"avec le préfixe #{config-}# sur 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 ""
-"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."
+"Par exemple, pour construire une image de récupération, utiliser le dépôt #"
+"{config-rescue}# comme suit:"
#. 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 --config git://live.debian.net/git/config-rescue.git\n"
msgstr ""
+" $ mkdir live-rescue && cd live-rescue\n"
+" $ lb config --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 ""
+"Modifier #{auto/config}# et toutes les autres choses dont vous avez besoin "
+"dans l'arbre #{config}# en fonction de vos besoins."
+
+#. 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 ""
-"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."
+"Vous pouvez éventuellement définir un raccourci dans votre configuration Git "
+"en ajoutant la ligne suivante à votre #{${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 ""
+"Cela vous permet d'utiliser # {ldn:} # partout où vous devez spécifier "
+"l'adresse d'un dépôt #{live.debian.net}# Si vous supprimez le suffixe "
+"optionnel #{.git}#, démarrer une nouvelle image en utilisant cette "
+"configuration est aussi simple que:"
+
+#. type: Plain text
+#: en/user_managing_a_configuration.ssi:76
+#, no-wrap
+msgid " $ lb config --config ldn:config-rescue\n"
+msgstr " $ lb config --config ldn:config-rescue\n"
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index 78a2847..e2bb0ac 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -1,26 +1,26 @@
# French translations for live-manual package
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
-# Carlos Zuferri «chals» <chals at altorricon.com>, 2011, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2011, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-16 18:50+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"
+"POT-Creation-Date: 2012-08-06 22:49+0300\n"
+"PO-Revision-Date: 2012-08-07 15:08+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: Debian Live <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#. type: Plain text
#: en/about_manual.ssi: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,10 +329,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
@@ -343,17 +355,12 @@ 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:"
+"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 ""
+"spécifier la distribution que vous voulez construire en utilisant son nom de "
+"code:"
#. type: Plain text
#: en/user_overview.ssi:55
@@ -364,7 +371,7 @@ msgstr "Il est possible de spécifier plusieurs options, telles que:"
#: 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/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index a6f509a..4117663 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-07-27 00:01+0300\n"
+"POT-Creation-Date: 2012-08-10 22:48+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-07-27\n"
+" :published: 2012-08-10\n"
msgstr ""
"@date:\n"
" :published: 2012-07-27\n"
@@ -65,8 +65,8 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /squeeze|wheezy|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|jessie|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
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/style_guide.ssi.po b/manual/po/it/style_guide.ssi.po
index ff1e7b4..de0fee1 100644
--- a/manual/po/it/style_guide.ssi.po
+++ b/manual/po/it/style_guide.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 17:04+0300\n"
+"POT-Creation-Date: 2012-07-31 23:27+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -26,7 +26,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
@@ -52,33 +52,35 @@ msgstr ""
#: 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: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: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:218
+#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
#: 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:350
+#: en/user_customization-packages.ssi:358 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: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_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
@@ -96,7 +98,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
@@ -121,34 +123,36 @@ msgstr "code{"
#: 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:206
+#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:363 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: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_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
@@ -801,41 +805,21 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:220
msgid ""
-"Some translators decide to include the code blocks in the translated files "
-"because it is easier for them to identify what has already been translated "
-"and what has not by looking at the percentages if they use a graphical "
-"translation program."
+"Even though the code blocks are usually untranslatable, including them in "
+"the translation is the only way to score a 100% complete translation. And "
+"even though it means more work at first because it requires the intervention "
+"of the translators if the code changes, it is the best way, in the long run, "
+"to identify what has already been translated and what has not when checking "
+"the integrity of the .po files."
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:222
-msgid ""
-"Include the code blocks if you want to score a 100% complete translation."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:224
-msgid ""
-"On the other hand some translators prefer to leave the code blocks "
-"\"untranslated\" (i.e. not including them). This makes the translation "
-"easier to maintain once finished because it does not require translators "
-"intervention if the code changes."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:226
-msgid ""
-"Leave the code blocks empty (they will be automatically added then) if you "
-"want to make your translation easier to maintain."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:228
msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:230
+#: en/style_guide.ssi:224
msgid ""
"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
@@ -844,48 +828,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:232
+#: en/style_guide.ssi:226
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:234
+#: en/style_guide.ssi:228
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:236
+#: en/style_guide.ssi:230
msgid "Translators should never translate:"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:238
+#: en/style_guide.ssi:232
msgid "The code names of releases"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:240
+#: en/style_guide.ssi:234
msgid "The names of programs"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:242
+#: en/style_guide.ssi:236
msgid "The commands given as examples"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:244
+#: en/style_guide.ssi:238
msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:246
+#: en/style_guide.ssi:240
msgid "Links"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:247
+#: en/style_guide.ssi:241
msgid "Paths"
msgstr ""
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 9519b32..f062894 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-04-14 22:45+0300\n"
+"POT-Creation-Date: 2012-08-10 22:48+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"
@@ -21,7 +21,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
@@ -38,51 +38,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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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,7 +92,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
@@ -108,51 +109,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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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"
@@ -171,6 +173,23 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:6
+#, fuzzy
+#| msgid ""
+#| "Perhaps the most basic customization of a Debian live system is the "
+#| "selection of packages to be included in the image. This chapter guides "
+#| "you through the various build-time options to customize live-build's "
+#| "installation of packages. The broadest choices influencing which packages "
+#| "are available to install in the image are the distribution and archive "
+#| "areas. To ensure decent download speeds, you should choose a nearby "
+#| "distribution mirror. You can also add your own repositories for "
+#| "backports, experimental or custom packages, or include packages directly "
+#| "as files. You can define your own lists of packages to include, use live-"
+#| "build's predefined lists, use /{tasksel}/ tasks, or a combination of all "
+#| "three. Finally, a number of options give some control over /{apt}/, or if "
+#| "you prefer, /{aptitude}/, at build time when packages are installed. You "
+#| "may find these handy if you use a proxy, want to disable installation of "
+#| "recommended packages to save space, or need to control which versions of "
+#| "packages are installed via APT pinning, to name a few possibilities."
msgid ""
"Perhaps the most basic customization of a Debian live system is the "
"selection of packages to be included in the image. This chapter guides you "
@@ -180,10 +199,10 @@ msgid ""
"areas. To ensure decent download speeds, you should choose a nearby "
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
-"can define your own lists of packages to include, use live-build's "
-"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
-"Finally, a number of options give some control over /{apt}/, or if you "
-"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"can define lists of packages, including metapackages which will install many "
+"related packages at once, such as packages for a particular desktop or "
+"language. Finally, a number of options give some control over /{apt}/, or if "
+"you prefer, /{aptitude}/, at build time when packages are installed. You may "
"find these handy if you use a proxy, want to disable installation of "
"recommended packages to save space, or need to control which versions of "
"packages are installed via APT pinning, to name a few possibilities."
@@ -242,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 ""
@@ -471,7 +490,7 @@ msgid "*{Note:}* some preconfigured package repositories are available for easy
msgstr "*{Nota:}* alcuni repository di pacchetti preconfigurati sono disponibili per una facile selezione attraverso l'opzione #{--archives}#, per abilitare gli snapshot live è sufficiente un semplice comando:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
msgstr ""
@@ -483,13 +502,23 @@ msgstr "2~choosing-packages-to-install Scegliere i pacchetti da installare"
#. type: Plain text
#: en/user_customization-packages.ssi:89
+#, fuzzy
+#| msgid ""
+#| "There are a number of ways to choose which packages live-build will "
+#| "install in your image, covering a variety of different needs. You can "
+#| "simply name individual packages to install in a package list. You can "
+#| "also choose predefined lists of packages, or use APT tasks. And finally, "
+#| "you may place package files in your #{config/}# tree, which is well "
+#| "suited to testing of new or experimental packages before they are "
+#| "available from a repository."
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"individual packages to install in a package list. You can also choose "
-"predefined lists of packages, or use APT tasks. And finally, you may place "
-"package files in your #{config/}# tree, which is well suited to testing of "
-"new or experimental packages before they are available from a repository."
+"individual packages to install in a package list. You can also use "
+"metapackages in those lists, or select them using package control file "
+"fields. And finally, you may place package files in your #{config/}# tree, "
+"which is well suited to testing of new or experimental packages before they "
+"are available from a repository."
msgstr ""
"Ci sono diversi modi per scegliere quali pacchetti live-build installerà "
"nell'immagine, coprendo una gamma di esigenze diverse. Si possono richiamare "
@@ -505,15 +534,22 @@ msgstr "3~package-lists Elenchi di pacchetti"
#. type: Plain text
#: en/user_customization-packages.ssi:93
+#, fuzzy
+#| msgid ""
+#| "Package lists are a powerful way of expressing which packages should be "
+#| "installed. The list syntax supports included files and conditional "
+#| "sections which makes it easy to build lists from other lists and adapt "
+#| "them for use in multiple configurations. You can use predefined package "
+#| "lists, providing in a modular fashion package selections from each of the "
+#| "major desktop environments and some special purpose lists, as well as "
+#| "standard lists the others are based upon. You can also provide your own "
+#| "package lists, or use a combination of both."
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
"which makes it easy to build lists from other lists and adapt them for use "
-"in multiple configurations. You can use predefined package lists, providing "
-"in a modular fashion package selections from each of the major desktop "
-"environments and some special purpose lists, as well as standard lists the "
-"others are based upon. You can also provide your own package lists, or use a "
-"combination of both."
+"in multiple configurations. Package names may also be injected into the list "
+"using shell helpers at build time."
msgstr ""
"Gli elenchi di pacchetti sono un potente mezzo per esprimere quali pacchetti "
"devono essere installati. La sintassi gestisce file inclusi e sezioni "
@@ -532,53 +568,89 @@ msgstr "*{Nota:}* quando si specifica un pacchetto che non esiste, il comportame
#. type: Plain text
#: en/user_customization-packages.ssi:97
-msgid "3~ Predefined package lists"
-msgstr "3~ Elenchi predefiniti di pacchetti"
+#, fuzzy
+#| msgid "2~ Use up-to-date packages"
+msgid "3~using-metapackages Using metapackages"
+msgstr "2~ Usare pacchetti aggiornati"
#. type: Plain text
#: en/user_customization-packages.ssi:99
msgid ""
-"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--package-lists}# option. For example:"
+"The simplest way to populate your package list is to use a task metapackage "
+"maintained by your distribution. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:104
+#, no-wrap
+msgid ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:108
+msgid ""
+"This supercedes the older predefined list method supported in #{live-build}# "
+"2.x. Unlike predefined lists, task metapackages are not specific to the "
+"Debian Live project. Instead, they are maintained by specialist working "
+"groups within the distribution and therefore reflect the consensus of each "
+"group about which packages best serve the needs of the intended users. They "
+"also cover a much broader range of use cases than the predefined lists they "
+"replace."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:110
+msgid ""
+"All task metapackages are prefixed #{task-}#, so a quick way to determine "
+"which are available (though it may contain a handful of false hits that "
+"match the name but aren't metapackages) is to match on the package name with:"
msgstr ""
-"Il modo più semplice per usare gli elenchi è di specificarne uno o più con "
-"l'opzione #{--package-lists}#. Per esempio:"
#. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:114
#, no-wrap
-msgid " $ lb config --package-lists \"gnome rescue\"\n"
+msgid " $ apt-cache search --names-only ^task-\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:118
msgid ""
-"The default location for the list files on your system is #{/usr/share/live/"
-"build/package-lists/}#. To determine the packages in a given list, read the "
-"corresponding file, paying attention to included files and conditionals as "
-"described in the following sections."
+"In addition to these, you will find other metapackages with various "
+"purposes. Some are subsets of broader task packages, like #{gnome-core}#, "
+"while others are individual specialized parts of a Debian Pure Blend, such "
+"as the #{education-*}# metapackages. To list all metapackages in the "
+"archive, install the #{debtags}# package and list all packages with the #"
+"{role::metapackage}# tag as follows:"
msgstr ""
-"Il percorso predefinito per i file elenco sul sistema è #{/usr/share/live/"
-"build/package-lists/}#. Per determinare i pacchetti in un dato elenco, si "
-"legga il file corrispondente, prestando attenzione ai file inclusi e "
-"condizionali come descritto nella sezioni seguenti."
#. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:122
+#, no-wrap
+msgid " $ debtags search role::metapackage\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr "3~ Elenchi locali dei pacchetti"
#. type: Plain text
-#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:128
msgid ""
-"You may supplement the predefined lists using local package lists stored in #"
-"{config/package-lists/}#."
+"Whether you list metapackages, individual packages, or a combination of "
+"both, all local package lists are stored in #{config/package-lists/}#. Since "
+"more than one list can be used, this lends itself well to modular designs. "
+"For example, you may decide to devote one list to a particular choice of "
+"desktop, another to a collection of related packages that might as easily be "
+"used on top of a different desktop. This allows you to experiment with "
+"different combinations of sets of packages with a minimum of fuss, sharing "
+"common lists between different live image projects."
msgstr ""
-"Gli elenchi predefiniti si possono integrare usando quelli locali dei "
-"pacchetti in #{config/package-lists/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -589,18 +661,18 @@ msgstr ""
"binary}# aggiuntivo per indicare per quale fase sia l'elenco."
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:132
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr "*{Nota:}* se non si specifica il suffisso l'elenco sarà usato per entrambe le fasi. Normalmente è preferibile specificare #{.list.chroot}# in modo che i pacchetti vengono installati solo nel filesystem live evitando di avere una copia extra del #{.deb}# sul dispositivo.\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:134
msgid "3~ Local binary package lists"
msgstr "3~ Elenchi locali di pacchetti binari"
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:136
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -617,48 +689,48 @@ msgstr ""
"chroot, usare semplicemente il suffisso #{.list}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "3~ Extending a provided package list using includes"
-msgstr "3~ Estendere un'elenco di pacchetti usando gli include"
+#: en/user_customization-packages.ssi:138
+#, fuzzy
+#| 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:123
+#: en/user_customization-packages.ssi:140
msgid ""
-"The package lists that are included with live-build make extensive use of "
-"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
-"directory, as they serve as good examples of how to write your own 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 "
+"command to be executed within the chroot when the image is built. For "
+"example, one might include the line #{! grep-aptavail -n -sPackage -"
+"FPriority standard | sort}# in a package list to produce a sorted list of "
+"available packages with #{Priority: standard}#."
msgstr ""
-"Gli elenchi di pacchetti inclusi in live-build fanno un notevole uso di "
-"include. Far riferimento a questi nella directory #{/usr/share/live/build/"
-"package-lists/}#, in quanto portano ottimi esempi su come scriverne di "
-"propri."
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:142
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list "
-"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
-"following contents:"
+"In fact, selecting packages with the #{grep-aptavail}# command (from the #"
+"{dctrl-tools}# package) is so useful that #{live-build}# provides a #"
+"{Packages}# helper script as a convenience. This script takes two arguments: "
+"#{field}# and #{pattern}#. Thus, you can create a list with the following "
+"contents:"
msgstr ""
-"Per esempio, per creare un elenco che includa quello predefinito di #{gnome}"
-"#più /{iceweasel}/, creare #{config/package-lists/mio.elenco.chroot}# con i "
-"seguenti contenuti:"
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
-" #include <gnome>\n"
-" iceweasel\n"
+" $ lb config\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr "3~ Usare condizioni all'interno degli elenchi di pacchetti"
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -675,7 +747,7 @@ msgstr ""
"abbia senso, come #{DISTRIBUTION}#, #{ARCHITECTURES}# o #{ARCHIVE_AREAS}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
@@ -684,7 +756,7 @@ msgstr ""
"amd64}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
@@ -693,7 +765,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:165
msgid ""
"You may test for any one of a number of values, e.g. to install /"
"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
@@ -704,7 +776,7 @@ msgstr ""
"architectures amd64}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURES i386 amd64\n"
@@ -713,7 +785,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:175
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
@@ -724,7 +796,7 @@ msgstr ""
"free}# tramite #{--archive-areas}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -733,12 +805,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr "Una condizione può coinvolegere una direttiva #{#include}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
@@ -747,62 +819,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr "Le condizioni nidificate non sono supportate."
#. type: Plain text
-#: en/user_customization-packages.ssi:180
-msgid "3~ Tasks"
-msgstr "3~ Task"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid ""
-"The Debian Installer offers the user choices of a number of preselected "
-"lists of packages, each one focused on a particular kind of system, or task "
-"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
-"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
-"by APT through the \"Task:\" field. You can specify one or more tasks in "
-"live-build by putting them in a list in #{config/task-lists/}#, as in the "
-"example below."
-msgstr ""
-"L'installatore Debian offre all'utente la scelta di vari elenchi di "
-"pacchetti pre-selezionati, ognuno dei quali focalizzato su un particolare "
-"tipo di sistema, o il tipo di attività per cui utilizzarlo, come \"Graphical "
-"desktop environment\", \"Mail server\" o \"Laptop\". Questi elenchi sono "
-"chiamati \"task\" e sono gestiti da APT attraverso il campo\"Task:\". In "
-"live-build si possono specificare uno o più task inserendoli in una lista in "
-"#{config/task-lists/}#, come nell'esempio seguente."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:187
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:191
-msgid ""
-"The primary tasks available in the Debian Installer can be listed with #"
-"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including the ones not included in this list, may be examined with #{tasksel "
-"--task-packages}#."
-msgstr ""
-"I task principali disponibili nell'installatore Debian possono essere "
-"elencati nel sistema live con #{tasksel --list-tasks}#. I contenuti di ogni "
-"task, inclusi quelli non inclusi in questo elenco, possono essere esaminati "
-"con #{tasksel --task-packages}#."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:197
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr "3~desktop-and-language-tasks Task per desktop e lingua"
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:199
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -826,7 +853,7 @@ msgstr ""
"corrispondenti task della lingua."
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:201
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -844,13 +871,20 @@ msgstr ""
"creazione di una live."
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:203
+#, fuzzy
+#| msgid ""
+#| "Because there is no provision made automatically for language tasks, "
+#| "which include such things as language-specific fonts and input-method "
+#| "packages, if you want them, you need to specify them in your "
+#| "configuration. For example, a GNOME desktop image containing support for "
+#| "Japanese might include these tasks:"
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
"you want them, you need to specify them in your configuration. For example, "
"a GNOME desktop image containing support for Japanese might include these "
-"tasks:"
+"task metapackages:"
msgstr ""
"Poiché automaticamente non viene fatta alcuna preparazione sui task della "
"lingua, i quali includono cose come caratteri specifici per la lingua e "
@@ -859,46 +893,16 @@ msgstr ""
"supporto per il giapponese può includere questi task:"
#. type: Plain text
-#: en/user_customization-packages.ssi:205
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
-" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:209
-msgid ""
-"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value, if it differs from the "
-"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
-"variable or else tasksel will not recognize and install it. Thus:"
-msgstr ""
-"Dal momento che i task desktop sono \"interni\", bisogna preconfigurare ogni "
-"altro desktop da includere nell'immagine e diverso dal predefinito \"gnome\" "
-"nella variabile debconf \"tasksel/desktop\", altrimenti tasksel non li "
-"installerà:"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:214
#, no-wrap
msgid ""
" $ lb config\n"
-" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:218
-msgid ""
-"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
-"\"."
+" $ echo \"task-gnome-desktop task-laptop\" >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-japanese task-japanese-desktop task-japanese-gnome-desktop\" >> config/package-lists/my.list.chroot\n"
msgstr ""
-"Questo parametro supporta valori multipli, ad esempio \"lxde xfce\" invece "
-"di \"kde\"."
#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:213
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
@@ -907,7 +911,7 @@ msgstr ""
"modificati o di terze parti"
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:215
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -924,7 +928,7 @@ msgstr ""
"utilizzati per aggiungere funzionalità proprietarie o su misura."
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:217
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -941,22 +945,22 @@ msgstr ""
"maint-guide/ e altrove."
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:219
msgid "There are two ways of installing modified custom packages:"
msgstr "Ci sono due modi per installare pacchetti personalizzati:"
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:221
msgid "_* #{packages.chroot}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:223
msgid "_* Using a custom APT repository"
msgstr "_* Utilizzare repository APT personalizzati"
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:225
msgid ""
"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
"customizations but has a number of drawbacks, whilst using a custom APT "
@@ -967,13 +971,13 @@ msgstr ""
"repository APT personalizzato è più laborioso da configurare."
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:227
msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr ""
"3~ Utilizzare #{packages.chroot}# per installare pacchetti personalizzati"
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:229
msgid ""
"To install a custom package, simply copy it to the #{config/packages.chroot/}"
"# directory. Packages that are inside this directory will be automatically "
@@ -986,7 +990,7 @@ msgstr ""
"specificarli altrove."
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:231
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
@@ -995,7 +999,7 @@ msgstr ""
"semplice per farlo è usare #{dpkg-name}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:233
msgid ""
"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
@@ -1004,12 +1008,12 @@ msgstr ""
"personalizzati presenta degli svantaggi:"
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:235
msgid "_* It is not possible to use secure APT."
msgstr "_* non è possibile usare secure APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:237
msgid ""
"_* You must install all appropriate packages in the #{config/packages."
"chroot/}# directory."
@@ -1018,7 +1022,7 @@ msgstr ""
"packages.chroot/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:239
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
@@ -1027,13 +1031,13 @@ msgstr ""
"versione."
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:241
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
"3~ Utilizzare un repository APT per installare pacchetti personalizzati"
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:243
msgid ""
"Unlike using #{packages.chroot}#, when using a custom APT repository you "
"must ensure that you specify the packages elsewhere. See {Choosing packages "
@@ -1045,7 +1049,7 @@ msgstr ""
"packages-to-install."
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:245
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -1056,12 +1060,12 @@ msgstr ""
"per offrire aggiornamenti dei pacchetti modificati."
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:247
msgid "3~ Custom packages and APT"
msgstr "3~ Pacchetti personalizzati e APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:249
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -1076,7 +1080,7 @@ msgstr ""
"sceglie di installare quello con il numero di versione più alto."
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:251
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -1091,12 +1095,12 @@ msgstr ""
"veda {APT pinning}#apt-pinning per maggiori informazioni."
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:253
msgid "2~ Configuring APT at build time"
msgstr "2~ Configurare APT in fase di costruzione"
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:255
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -1113,12 +1117,12 @@ msgstr ""
"iniziano con #{apt}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:257
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr "3~choosing-apt-or-aptitude Scegliere apt o aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:259
msgid ""
"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -1133,7 +1137,7 @@ msgstr ""
"vengono gestiti quelli mancanti."
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:261
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
@@ -1142,7 +1146,7 @@ msgstr ""
"esito negativo; questo è l'impostazine predefinita."
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:263
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
@@ -1151,12 +1155,12 @@ msgstr ""
"avrà successo."
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:265
msgid "3~ Using a proxy with APT"
msgstr "3~ Utilizzare un proxy con APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:267
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -1167,18 +1171,20 @@ msgstr ""
"ftp-proxy}# o #{--apt-http-proxy}# secondo necessità:"
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:271
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:282
-msgid "3~ Tweaking APT to save space"
+#: en/user_customization-packages.ssi:275
+#, fuzzy
+#| msgid "3~ Tweaking APT to save space"
+msgid "3~tweaking-apt-to-save-space Tweaking APT to save space"
msgstr "3~ Modificare APT per risparmiare spazio"
#. type: Plain text
-#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:277
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -1188,20 +1194,20 @@ msgstr ""
"in tal caso una o entrambe delle seguenti opzioni possono essere d'interesse."
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:279
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr "È possibile non includere gli indici di APT con:"
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:283
#, no-wrap
msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:287
msgid ""
"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
@@ -1216,34 +1222,66 @@ msgstr ""
"l'utente deve usare prima #{apt-get update}# per crearli."
#. type: Plain text
-#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:289
+#, fuzzy
+#| msgid ""
+#| "If you find the installation of recommended packages bloats your image "
+#| "too much, you may disable that default option of APT with:"
msgid ""
"If you find the installation of recommended packages bloats your image too "
-"much, you may disable that default option of APT with:"
+"much, provided you are prepared to deal with the consequences discussed "
+"below, you may disable that default option of APT with:"
msgstr ""
"In caso si trovi che l'installazione dei pacchetti raccomandati appesantisca "
"troppo l'immagine, si può disabilitare l'opzione predefinita di APT con:"
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:293
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:304
-msgid ""
-"The tradeoff here is that if you don't install recommended packages for a "
-"given package, that is, \"packages that would be found together with this "
-"one in all but unusual installations\" (Debian Policy Manual, section 7.2), "
-"some packages that you actually need may be omitted. Therefore, we suggest "
-"you review the difference turning off recommends makes to your packages list "
-"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
-"in your list any missing packages that you still want installed. "
-"Alternatively, if you find you only want a small number of recommended "
-"packages left out, leave recommends enabled and set a negative APT pin "
-"priority on selected packages to prevent them from being installed, as "
-"explained in {APT pinning}#apt-pinning."
+#: en/user_customization-packages.ssi:297
+msgid ""
+"The most important consequence of turning off recommends is that #{live-boot}"
+"# and #{live-config}# themselves recommend some packages that provide "
+"important functionality used by most Live configurations, such as #{user-"
+"setup}# which #{live-config}# recommends and is used to create the live "
+"user. In all but the most exceptional circumstances you need to add back at "
+"least some of these recommends to your package lists or else your image will "
+"not work as expected, if at all. Look at the recommended packages for each "
+"of the #{live-*}# packages included in your build and if you are not certain "
+"you can omit them, add them back into your package lists."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:299
+#, fuzzy
+#| msgid ""
+#| "The tradeoff here is that if you don't install recommended packages for a "
+#| "given package, that is, \"packages that would be found together with this "
+#| "one in all but unusual installations\" (Debian Policy Manual, section "
+#| "7.2), some packages that you actually need may be omitted. Therefore, we "
+#| "suggest you review the difference turning off recommends makes to your "
+#| "packages list (see the #{binary.packages}# file generated by #{lb build}"
+#| "#) and re-include in your list any missing packages that you still want "
+#| "installed. Alternatively, if you find you only want a small number of "
+#| "recommended packages left out, leave recommends enabled and set a "
+#| "negative APT pin priority on selected packages to prevent them from being "
+#| "installed, as explained in {APT pinning}#apt-pinning."
+msgid ""
+"The more general consequence is that if you don't install recommended "
+"packages for any given package, that is, \"packages that would be found "
+"together with this one in all but unusual installations\" (Debian Policy "
+"Manual, section 7.2), some packages that users of your Live system actually "
+"need may be omitted. Therefore, we suggest you review the difference turning "
+"off recommends makes to your packages list (see the #{binary.packages}# file "
+"generated by #{lb build}#) and re-include in your list any missing packages "
+"that you still want installed. Alternatively, if you find you only want a "
+"small number of recommended packages left out, leave recommends enabled and "
+"set a negative APT pin priority on selected packages to prevent them from "
+"being installed, as explained in {APT pinning}#apt-pinning."
msgstr ""
"Qui il compromesso è dato dal fatto che se non si installano i raccomandati "
"per un certo pacchetto, ovvero \"pacchetti che si trovano assieme a questo "
@@ -1258,12 +1296,12 @@ msgstr ""
"spiegato in {APT pinning}#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:301
msgid "3~ Passing options to apt or aptitude"
msgstr "3~ Passare opzioni ad apt o aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:303
msgid ""
"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1276,12 +1314,12 @@ msgstr ""
"di #{apt}# e #{aptitude}# per i dettagli."
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:305
msgid "3~apt-pinning APT pinning"
msgstr "3~apt-pinning APT pinning"
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:307
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1294,7 +1332,7 @@ msgstr ""
"{config/includes.chroot/etc/apt/preferences}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:309
msgid ""
"Let's say you are building a wheezy live system but need all the live "
"packages that end up in the binary image to be installed from sid at build "
@@ -1311,7 +1349,7 @@ msgstr ""
"servirà allo scopo:"
#. type: Plain text
-#: en/user_customization-packages.ssi:322
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
@@ -1322,7 +1360,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" Package: *\n"
@@ -1332,27 +1370,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:326
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
msgstr "*{Nota:}* con la versione 0.8.14 o superiore di Apt si possono utilizzare wildcard nei nomi dei pacchetti (*{Package: live-*}*). Ciò significa che funziona con wheezy usando:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:330
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:334
+#, fuzzy
+#| msgid ""
+#| "Negative pin priorities will prevent a package from being installed, as "
+#| "in the case where you do not want a package that is recommended by "
+#| "another package. Suppose you are building an LXDE image using #{--package-"
+#| "lists lxde}# option, but don't want the user prompted to store wifi "
+#| "passwords in the keyring. This list includes /{gdm}/, which depends on /"
+#| "{gksu}/, which in turn recommends /{gnome-keyring}/. So you want to omit "
+#| "the recommended /{gnome-keyring}/ package. This can be done by adding the "
+#| "following stanza to #{config/chroot_apt/preferences}#:"
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
-"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
-"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
-"{gnome-keyring}/ package. This can be done by adding the following stanza to "
-"#{config/chroot_apt/preferences}#:"
+"package. Suppose you are building an LXDE image using #{task-lxde-desktop}# "
+"in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the "
+"user prompted to store wifi passwords in the keyring. This metapackage "
+"depends on /{lxde-core}/, which recommends /{gksu}/, which in turn "
+"recommends /{gnome-keyring}/. So you want to omit the recommended /{gnome-"
+"keyring}/ package. This can be done by adding the following stanza to #"
+"{config/chroot_apt/preferences}#:"
msgstr ""
"Un valore negativo della priorità evita che un pacchetto venga installato, "
"come nel caso in cui non se ne voglia uno raccomandato da un altro. Si "
@@ -1364,7 +1413,7 @@ msgstr ""
"chroot_apt/preferences}# la seguente definizione:"
#. type: Plain text
-#: en/user_customization-packages.ssi:345
+#: en/user_customization-packages.ssi:340
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index ed14ee3..93b05a0 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-07-27 21:48+0300\n"
"PO-Revision-Date: 2012-06-18 19:35+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -338,8 +338,8 @@ msgstr ""
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 "
+"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:"
@@ -407,7 +407,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ 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"
msgstr ""
#. type: Plain text
@@ -417,10 +417,10 @@ msgid ""
"{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:"
+"# 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:"
msgstr ""
#. type: Plain text
@@ -428,7 +428,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index cf0b2ae..70bdae4 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-10 22:48+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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:266
#, 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:235
#, 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,92 @@ 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 initial "
+"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:197
+msgid ""
+"As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you "
+"may need to re-add some recommended packages to make your image work "
+"properly."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:199
+msgid "An easy way to list recommends is using /{apt-cache}/. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:203
+#, no-wrap
+msgid " $ apt-cache depends live-config live-boot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
+msgid ""
+"In this example we found out that we had to re-include several packages "
+"recommended by live-config and live-boot: #{user-setup}# to make autologin "
+"work and #{sudo}# as an essential program to shutdown the system. Besides, "
+"it could be handy to add #{live-tools}# to be able to copy the image to RAM "
+"and #{eject}# to eventually eject the live media, So:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:211
+#, fuzzy
+#| msgid ""
+#| "Now append the /{vlc}/ package to our local package list in #{config/"
+#| "package-lists/my.list.chroot}#:"
+msgid ""
+"$ echo \"live-tools user-setup sudo eject\" > config/package-lists/"
+"recommends.list.chroot"
+msgstr ""
+"Ora inserire il pacchetto /{vlc}/ all'elenco locale dei pacchetti #{config/"
+"package-lists/my.list.chroot}#:"
+
+#. type: Plain text
+#: en/user_examples.ssi:215
+#, 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 +733,7 @@ msgstr ""
"{192.168.1.2}#:"
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:221
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -686,7 +742,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:224
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -694,7 +750,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:227
#, no-wrap
msgid ""
" exit\n"
@@ -702,38 +758,50 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:231
msgid "Build the image:"
msgstr "Costruire l'immagine:"
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:239
msgid "Enjoy."
msgstr "Buon divertimento."
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:241
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:243
+#, 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:245
+#, 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 +814,78 @@ msgstr ""
"{important}* che molto probabilmente produrrà un sistema live danneggiato."
#. type: Plain text
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:250
#, 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:254
+msgid ""
+"To make the image work properly, we must re-add, at least, two recommended "
+"packages which are left out by the #{--apt-recommends false}# option. See "
+"{Tweaking APT to save space}#tweaking-apt-to-save-space"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:258
+#, fuzzy, no-wrap
+#| msgid "Now append the /{vlc}/ package to our local package list in #{config/package-lists/my.list.chroot}#:"
+msgid " $ echo \"user-setup sudo\" > config/package-lists/recommends.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:262
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:270
+#, 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:272
+#, 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."
+"chroot}# 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,18 +901,28 @@ msgstr ""
"se le funzionalità sacrificate con ciascuna ottimizzazione valgono la pena."
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:274
+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:276
msgid "2~ A localized KDE desktop and installer"
msgstr "2~ Un desktop KDE localizzato e l'installer"
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:278
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr "*{Caso d'uso:}* creazione di un'immagine con il desktop KDE, localizzato per il portoghese brasiliano e che includa l'installatore.\n"
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:280
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -823,7 +934,7 @@ msgstr ""
"KDE."
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:282
msgid ""
"Our initial problem is the discovery of the names of the appropriate "
"language tasks. Currently, live-build cannot help with this. While we might "
@@ -838,18 +949,18 @@ msgstr ""
"assicursi di avere entrambi questi pacchetti:"
#. type: Plain text
-#: en/user_examples.ssi:260
+#: en/user_examples.ssi:286
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:264
+#: en/user_examples.ssi:290
msgid "Now we can search for the appropriate tasks, first with:"
msgstr "Ora si possono cercare i task appropriati:"
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:295
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -857,7 +968,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:299
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
@@ -866,7 +977,7 @@ msgstr ""
"chiaramente, brazilian-portuguese. Ora per trovare i task correlati:"
#. type: Plain text
-#: en/user_examples.ssi:279
+#: en/user_examples.ssi:305
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -875,22 +986,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:309
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
-"latin1 keyboard layout. We will also need to preseed our desktop choice, "
-"\"kde\" so that tasksel will install the correct desktop task, as it differs "
-"from the default (see {Desktop and languages tasks}#desktop-and-language-"
-"tasks). Now let's put the pieces together:"
+"latin1 keyboard layout. Now let's put the pieces together. Recalling from "
+"{Using metapackages}#using-metapackages that task metapackages are prefixed #"
+"{task-}#, we just specify these language boot parameters, then add standard "
+"priority packages and all our discovered task metapackages to our package "
+"list as follows:"
msgstr ""
-"Durante l'avvio verrà generata la localizzazione pt_BR.UTF-8 e selezionato "
-"il layout di tastiera pt-latin1. Ci sarà anche bisogno di preconfigurare la "
-"nostra scelta desktop, \"kde\" cosicché tasksel installerà il task corretto, "
-"che differisce dal predefinito (vedere {Task per desktop e lingua}#desktop-"
-"and-language-tasks). È ora di mettere insieme i pezzi:"
#. type: Plain text
-#: en/user_examples.ssi:297
+#: en/user_examples.ssi:323
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -900,14 +1007,14 @@ msgid ""
" -k 486 \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
-" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
-" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
-" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \\\n"
+" task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:300
+#: en/user_examples.ssi:326
msgid ""
"Note that we have included the debian-installer-launcher package to launch "
"the installer from the live desktop, and have also specified the 486 flavour "
diff --git a/manual/po/it/user_installation.ssi.po b/manual/po/it/user_installation.ssi.po
index f151fe8..6768f34 100644
--- a/manual/po/it/user_installation.ssi.po
+++ b/manual/po/it/user_installation.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-16 18:50+0300\n"
+"POT-Creation-Date: 2012-08-08 13:49+0300\n"
"PO-Revision-Date: 2012-06-18 19:49+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -21,7 +21,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
@@ -38,51 +38,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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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,7 +92,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
@@ -108,57 +109,58 @@ 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
msgstr ""
@@ -196,7 +198,9 @@ msgstr "_* Una versione aggiornata di live-build"
#. type: Plain text
#: en/user_installation.ssi:14
-msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
+#, fuzzy
+#| msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
+msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/"
msgstr "_* Una shell POSIX-compliant, come /{bash}/ o /{dash}/."
#. type: Plain text
@@ -206,7 +210,7 @@ msgstr "_* /{debootstrap}/ o /{cdebootstrap}/"
#. type: Plain text
#: en/user_installation.ssi:18
-msgid "_* Linux 2.6.x"
+msgid "_* Linux 2.6.x or 3.x"
msgstr ""
#. type: Plain text
@@ -357,7 +361,7 @@ msgid " # make uninstall\n"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:96 en/user_installation.ssi:142
+#: en/user_installation.ssi:96 en/user_installation.ssi:149
msgid "3~ From 'snapshots'"
msgstr "3~ Da \"istantanee\""
@@ -470,7 +474,9 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:138
-msgid "_* Use all generated .deb files"
+#, fuzzy
+#| msgid "_* Use all generated .deb files"
+msgid "_* Use applicable generated .deb files"
msgstr "_* Usare il .deb di live-boot generato"
#. type: Plain text
@@ -478,20 +484,29 @@ msgstr "_* Usare il .deb di live-boot generato"
msgid ""
"As live-boot and live-config are installed by live-build system, installing "
"the packages in the host system is not sufficient: you should treat the "
-"generated .deb files like any other custom packages. Please see {Customizing "
-"package installation}#customizing-package-installation for more information. "
-"You should pay particular attention to {Additional repositories}#additional-"
-"repositories."
+"generated .deb files like any other custom packages. Since your purpose for "
+"building from source is like to test new things over the short term before "
+"the official release, follow {Installing modified or third-party packages}"
+"#installing-modified-or-third-party-packages to temporarily include the "
+"relevant files in your configuration. In particular, notice that both "
+"packages are divided into a generic part, a documentation part and one or "
+"more back-ends. Include the generic part, only one back-end matching your "
+"configuration, and optionally the documentation. Assuming you are building a "
+"live image in the current directory and have generated all .deb files for a "
+"single version of both packages in the directory above, these bash commands "
+"would copy all of the relevant packages including default back-ends:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:145
+#, no-wrap
+msgid ""
+" $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/\n"
+" $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/\n"
msgstr ""
-"Siccome live-boot e live-config sono installati dal sistema live-build, "
-"installare il pacchetto nel sistema host non è sufficiente: occorre trattare "
-"il .deb generato come un qualsiasi altro pacchetto creato su misura. Per "
-"maggiori informazioni si veda {Personalizzare l'installazione dei pacchetti}"
-"#customizing-package-installation. Si presti particolare attenzione a "
-"{Repository aggiuntivi}#additional-repositories."
#. type: Plain text
-#: en/user_installation.ssi:144
+#: en/user_installation.ssi:151
msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
diff --git a/manual/po/it/user_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
index 98cd1bb..c3c4793 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-07 13:47+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"
@@ -179,67 +181,70 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:8
-msgid "2~ Use auto to manage configuration changes"
+#, fuzzy
+#| msgid "2~ Use auto to manage configuration changes"
+msgid "2~ Dealing with configuration changes"
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 use auto scripts? What do they do?"
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 +260,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 --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 --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 5da5144..19c0a37 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-07-27 00:01+0300\n"
+"POT-Creation-Date: 2012-08-10 22:48+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-07-27\n"
+" :published: 2012-08-10\n"
msgstr ""
"@date:\n"
-" :published: 27-07-2012\n"
+" :published: 10-08-2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -65,8 +65,8 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /squeeze|wheezy|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|jessie|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
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/style_guide.ssi.po b/manual/po/pt_BR/style_guide.ssi.po
index 298f1cb..47dd784 100644
--- a/manual/po/pt_BR/style_guide.ssi.po
+++ b/manual/po/pt_BR/style_guide.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 17:04+0300\n"
+"POT-Creation-Date: 2012-07-31 23:27+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\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
@@ -50,33 +50,35 @@ msgstr ""
#: 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: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: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:218
+#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
#: 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:350
+#: en/user_customization-packages.ssi:358 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: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_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
@@ -94,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
@@ -119,34 +121,36 @@ msgstr "code{"
#: 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:206
+#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:363 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: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_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
@@ -799,41 +803,21 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:220
msgid ""
-"Some translators decide to include the code blocks in the translated files "
-"because it is easier for them to identify what has already been translated "
-"and what has not by looking at the percentages if they use a graphical "
-"translation program."
+"Even though the code blocks are usually untranslatable, including them in "
+"the translation is the only way to score a 100% complete translation. And "
+"even though it means more work at first because it requires the intervention "
+"of the translators if the code changes, it is the best way, in the long run, "
+"to identify what has already been translated and what has not when checking "
+"the integrity of the .po files."
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:222
-msgid ""
-"Include the code blocks if you want to score a 100% complete translation."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:224
-msgid ""
-"On the other hand some translators prefer to leave the code blocks "
-"\"untranslated\" (i.e. not including them). This makes the translation "
-"easier to maintain once finished because it does not require translators "
-"intervention if the code changes."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:226
-msgid ""
-"Leave the code blocks empty (they will be automatically added then) if you "
-"want to make your translation easier to maintain."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:228
msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:230
+#: en/style_guide.ssi:224
msgid ""
"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
@@ -842,48 +826,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:232
+#: en/style_guide.ssi:226
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:234
+#: en/style_guide.ssi:228
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:236
+#: en/style_guide.ssi:230
msgid "Translators should never translate:"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:238
+#: en/style_guide.ssi:232
msgid "The code names of releases"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:240
+#: en/style_guide.ssi:234
msgid "The names of programs"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:242
+#: en/style_guide.ssi:236
msgid "The commands given as examples"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:244
+#: en/style_guide.ssi:238
msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:246
+#: en/style_guide.ssi:240
msgid "Links"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:247
+#: en/style_guide.ssi:241
msgid "Paths"
msgstr ""
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 b6f5ff6..566b6f3 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-04-14 22:45+0300\n"
+"POT-Creation-Date: 2012-08-10 22:48+0300\n"
"PO-Revision-Date: 2010-10-22 08:58-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-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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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-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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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"
@@ -176,10 +178,10 @@ msgid ""
"areas. To ensure decent download speeds, you should choose a nearby "
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
-"can define your own lists of packages to include, use live-build's "
-"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
-"Finally, a number of options give some control over /{apt}/, or if you "
-"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"can define lists of packages, including metapackages which will install many "
+"related packages at once, such as packages for a particular desktop or "
+"language. Finally, a number of options give some control over /{apt}/, or if "
+"you prefer, /{aptitude}/, at build time when packages are installed. You may "
"find these handy if you use a proxy, want to disable installation of "
"recommended packages to save space, or need to control which versions of "
"packages are installed via APT pinning, to name a few possibilities."
@@ -210,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 ""
@@ -382,7 +384,7 @@ msgid "*{Note:}* some preconfigured package repositories are available for easy
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
msgstr ""
@@ -397,10 +399,11 @@ msgstr ""
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"individual packages to install in a package list. You can also choose "
-"predefined lists of packages, or use APT tasks. And finally, you may place "
-"package files in your #{config/}# tree, which is well suited to testing of "
-"new or experimental packages before they are available from a repository."
+"individual packages to install in a package list. You can also use "
+"metapackages in those lists, or select them using package control file "
+"fields. And finally, you may place package files in your #{config/}# tree, "
+"which is well suited to testing of new or experimental packages before they "
+"are available from a repository."
msgstr ""
#. type: Plain text
@@ -414,11 +417,8 @@ msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
"which makes it easy to build lists from other lists and adapt them for use "
-"in multiple configurations. You can use predefined package lists, providing "
-"in a modular fashion package selections from each of the major desktop "
-"environments and some special purpose lists, as well as standard lists the "
-"others are based upon. You can also provide your own package lists, or use a "
-"combination of both."
+"in multiple configurations. Package names may also be injected into the list "
+"using shell helpers at build time."
msgstr ""
#. type: Plain text
@@ -429,45 +429,89 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:97
-msgid "3~ Predefined package lists"
-msgstr ""
+#, fuzzy
+#| msgid "3~ Applying patches"
+msgid "3~using-metapackages Using metapackages"
+msgstr "3~ Aplicando patches"
#. type: Plain text
#: en/user_customization-packages.ssi:99
msgid ""
-"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--package-lists}# option. For example:"
+"The simplest way to populate your package list is to use a task metapackage "
+"maintained by your distribution. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:104
+#, no-wrap
+msgid ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:108
+msgid ""
+"This supercedes the older predefined list method supported in #{live-build}# "
+"2.x. Unlike predefined lists, task metapackages are not specific to the "
+"Debian Live project. Instead, they are maintained by specialist working "
+"groups within the distribution and therefore reflect the consensus of each "
+"group about which packages best serve the needs of the intended users. They "
+"also cover a much broader range of use cases than the predefined lists they "
+"replace."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:110
+msgid ""
+"All task metapackages are prefixed #{task-}#, so a quick way to determine "
+"which are available (though it may contain a handful of false hits that "
+"match the name but aren't metapackages) is to match on the package name with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:114
#, no-wrap
-msgid " $ lb config --package-lists \"gnome rescue\"\n"
+msgid " $ apt-cache search --names-only ^task-\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:118
msgid ""
-"The default location for the list files on your system is #{/usr/share/live/"
-"build/package-lists/}#. To determine the packages in a given list, read the "
-"corresponding file, paying attention to included files and conditionals as "
-"described in the following sections."
+"In addition to these, you will find other metapackages with various "
+"purposes. Some are subsets of broader task packages, like #{gnome-core}#, "
+"while others are individual specialized parts of a Debian Pure Blend, such "
+"as the #{education-*}# metapackages. To list all metapackages in the "
+"archive, install the #{debtags}# package and list all packages with the #"
+"{role::metapackage}# tag as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:122
+#, no-wrap
+msgid " $ debtags search role::metapackage\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:128
msgid ""
-"You may supplement the predefined lists using local package lists stored in #"
-"{config/package-lists/}#."
+"Whether you list metapackages, individual packages, or a combination of "
+"both, all local package lists are stored in #{config/package-lists/}#. Since "
+"more than one list can be used, this lends itself well to modular designs. "
+"For example, you may decide to devote one list to a particular choice of "
+"desktop, another to a collection of related packages that might as easily be "
+"used on top of a different desktop. This allows you to experiment with "
+"different combinations of sets of packages with a minimum of fuss, sharing "
+"common lists between different live image projects."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -475,18 +519,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:132
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:134
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:136
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -497,41 +541,46 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "3~ Extending a provided package list using includes"
+#: en/user_customization-packages.ssi:138
+msgid "3~generated-package-lists Generated package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:140
msgid ""
-"The package lists that are included with live-build make extensive use of "
-"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
-"directory, as they serve as good examples of how to write your own 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 "
+"command to be executed within the chroot when the image is built. For "
+"example, one might include the line #{! grep-aptavail -n -sPackage -"
+"FPriority standard | sort}# in a package list to produce a sorted list of "
+"available packages with #{Priority: standard}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:142
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list "
-"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
-"following contents:"
+"In fact, selecting packages with the #{grep-aptavail}# command (from the #"
+"{dctrl-tools}# package) is so useful that #{live-build}# provides a #"
+"{Packages}# helper script as a convenience. This script takes two arguments: "
+"#{field}# and #{pattern}#. Thus, you can create a list with the following "
+"contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
-" #include <gnome>\n"
-" iceweasel\n"
+" $ lb config\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -542,14 +591,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
@@ -558,7 +607,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:165
msgid ""
"You may test for any one of a number of values, e.g. to install /"
"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
@@ -566,7 +615,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURES i386 amd64\n"
@@ -575,7 +624,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:175
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
@@ -583,7 +632,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -592,12 +641,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
@@ -606,51 +655,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:180
-msgid "3~ Tasks"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid ""
-"The Debian Installer offers the user choices of a number of preselected "
-"lists of packages, each one focused on a particular kind of system, or task "
-"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
-"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
-"by APT through the \"Task:\" field. You can specify one or more tasks in "
-"live-build by putting them in a list in #{config/task-lists/}#, as in the "
-"example below."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:187
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:191
-msgid ""
-"The primary tasks available in the Debian Installer can be listed with #"
-"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including the ones not included in this list, may be examined with #{tasksel "
-"--task-packages}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:197
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:199
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -664,7 +679,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:201
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -675,57 +690,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:203
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
"you want them, you need to specify them in your configuration. For example, "
"a GNOME desktop image containing support for Japanese might include these "
-"tasks:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:205
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
-" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
+"task metapackages:"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:209
-msgid ""
-"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value, if it differs from the "
-"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
-"variable or else tasksel will not recognize and install it. Thus:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:214
#, no-wrap
msgid ""
" $ lb config\n"
-" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:218
-msgid ""
-"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
-"\"."
+" $ echo \"task-gnome-desktop task-laptop\" >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-japanese task-japanese-desktop task-japanese-gnome-desktop\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:213
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:215
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -736,7 +727,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:217
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -747,22 +738,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:219
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:221
msgid "_* #{packages.chroot}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:223
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:225
msgid ""
"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
"customizations but has a number of drawbacks, whilst using a custom APT "
@@ -770,12 +761,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:227
msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:229
msgid ""
"To install a custom package, simply copy it to the #{config/packages.chroot/}"
"# directory. Packages that are inside this directory will be automatically "
@@ -784,45 +775,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:231
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:233
msgid ""
"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:235
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:237
msgid ""
"_* You must install all appropriate packages in the #{config/packages."
"chroot/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:239
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:241
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:243
msgid ""
"Unlike using #{packages.chroot}#, when using a custom APT repository you "
"must ensure that you specify the packages elsewhere. See {Choosing packages "
@@ -830,7 +821,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:245
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -838,12 +829,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:247
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:249
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -853,7 +844,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:251
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -863,12 +854,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:253
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:255
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -879,12 +870,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:257
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:259
msgid ""
"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -894,26 +885,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:261
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:263
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:265
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:267
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -921,18 +912,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:271
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:282
-msgid "3~ Tweaking APT to save space"
+#: en/user_customization-packages.ssi:275
+msgid "3~tweaking-apt-to-save-space Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:277
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -940,20 +931,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:279
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:283
#, no-wrap
msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:287
msgid ""
"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
@@ -963,41 +954,56 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:289
msgid ""
"If you find the installation of recommended packages bloats your image too "
-"much, you may disable that default option of APT with:"
+"much, provided you are prepared to deal with the consequences discussed "
+"below, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:293
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:304
+#: en/user_customization-packages.ssi:297
msgid ""
-"The tradeoff here is that if you don't install recommended packages for a "
-"given package, that is, \"packages that would be found together with this "
-"one in all but unusual installations\" (Debian Policy Manual, section 7.2), "
-"some packages that you actually need may be omitted. Therefore, we suggest "
-"you review the difference turning off recommends makes to your packages list "
-"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
-"in your list any missing packages that you still want installed. "
-"Alternatively, if you find you only want a small number of recommended "
-"packages left out, leave recommends enabled and set a negative APT pin "
-"priority on selected packages to prevent them from being installed, as "
-"explained in {APT pinning}#apt-pinning."
+"The most important consequence of turning off recommends is that #{live-boot}"
+"# and #{live-config}# themselves recommend some packages that provide "
+"important functionality used by most Live configurations, such as #{user-"
+"setup}# which #{live-config}# recommends and is used to create the live "
+"user. In all but the most exceptional circumstances you need to add back at "
+"least some of these recommends to your package lists or else your image will "
+"not work as expected, if at all. Look at the recommended packages for each "
+"of the #{live-*}# packages included in your build and if you are not certain "
+"you can omit them, add them back into your package lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:299
+msgid ""
+"The more general consequence is that if you don't install recommended "
+"packages for any given package, that is, \"packages that would be found "
+"together with this one in all but unusual installations\" (Debian Policy "
+"Manual, section 7.2), some packages that users of your Live system actually "
+"need may be omitted. Therefore, we suggest you review the difference turning "
+"off recommends makes to your packages list (see the #{binary.packages}# file "
+"generated by #{lb build}#) and re-include in your list any missing packages "
+"that you still want installed. Alternatively, if you find you only want a "
+"small number of recommended packages left out, leave recommends enabled and "
+"set a negative APT pin priority on selected packages to prevent them from "
+"being installed, as explained in {APT pinning}#apt-pinning."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:301
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:303
msgid ""
"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1006,12 +1012,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:305
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:307
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1020,7 +1026,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:309
msgid ""
"Let's say you are building a wheezy live system but need all the live "
"packages that end up in the binary image to be installed from sid at build "
@@ -1031,7 +1037,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:322
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
@@ -1042,7 +1048,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" Package: *\n"
@@ -1052,31 +1058,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:326
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:330
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:334
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
-"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
-"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
-"{gnome-keyring}/ package. This can be done by adding the following stanza to "
-"#{config/chroot_apt/preferences}#:"
+"package. Suppose you are building an LXDE image using #{task-lxde-desktop}# "
+"in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the "
+"user prompted to store wifi passwords in the keyring. This metapackage "
+"depends on /{lxde-core}/, which recommends /{gksu}/, which in turn "
+"recommends /{gnome-keyring}/. So you want to omit the recommended /{gnome-"
+"keyring}/ package. This can be done by adding the following stanza to #"
+"{config/chroot_apt/preferences}#:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:345
+#: en/user_customization-packages.ssi:340
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index f801ce4..60255c4 100644
--- a/manual/po/pt_BR/user_customization-runtime.ssi.po
+++ b/manual/po/pt_BR/user_customization-runtime.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-07-27 21:48+0300\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -292,8 +292,8 @@ msgstr ""
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 "
+"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:"
@@ -348,7 +348,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ 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"
msgstr ""
#. type: Plain text
@@ -358,10 +358,10 @@ msgid ""
"{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:"
+"# 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:"
msgstr ""
#. type: Plain text
@@ -369,7 +369,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
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..4a3fe18 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-10 22:48+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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:266
#, 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:235
#, 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,85 @@ 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 initial "
+"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:197
+msgid ""
+"As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you "
+"may need to re-add some recommended packages to make your image work "
+"properly."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:199
+msgid "An easy way to list recommends is using /{apt-cache}/. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:203
+#, no-wrap
+msgid " $ apt-cache depends live-config live-boot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
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}#:"
+"In this example we found out that we had to re-include several packages "
+"recommended by live-config and live-boot: #{user-setup}# to make autologin "
+"work and #{sudo}# as an essential program to shutdown the system. Besides, "
+"it could be handy to add #{live-tools}# to be able to copy the image to RAM "
+"and #{eject}# to eventually eject the live media, So:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:211
+msgid ""
+"$ echo \"live-tools user-setup sudo eject\" > config/package-lists/"
+"recommends.list.chroot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:215
+msgid ""
+"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:221
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -584,7 +624,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:224
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -592,7 +632,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:227
#, no-wrap
msgid ""
" exit\n"
@@ -600,92 +640,113 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:231
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:239
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:241
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:243
#, 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:245
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:250
#, 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:254
+msgid ""
+"To make the image work properly, we must re-add, at least, two recommended "
+"packages which are left out by the #{--apt-recommends false}# option. See "
+"{Tweaking APT to save space}#tweaking-apt-to-save-space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:258
+#, no-wrap
+msgid " $ echo \"user-setup sudo\" > config/package-lists/recommends.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:262
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:270
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:272
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."
+"chroot}# hook removes some unused packages and files."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:274
+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:276
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:278
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:280
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -693,7 +754,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:282
msgid ""
"Our initial problem is the discovery of the names of the appropriate "
"language tasks. Currently, live-build cannot help with this. While we might "
@@ -703,18 +764,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:260
+#: en/user_examples.ssi:286
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:264
+#: en/user_examples.ssi:290
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:295
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -722,14 +783,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:299
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:279
+#: en/user_examples.ssi:305
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -738,17 +799,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:309
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
-"latin1 keyboard layout. We will also need to preseed our desktop choice, "
-"\"kde\" so that tasksel will install the correct desktop task, as it differs "
-"from the default (see {Desktop and languages tasks}#desktop-and-language-"
-"tasks). Now let's put the pieces together:"
+"latin1 keyboard layout. Now let's put the pieces together. Recalling from "
+"{Using metapackages}#using-metapackages that task metapackages are prefixed #"
+"{task-}#, we just specify these language boot parameters, then add standard "
+"priority packages and all our discovered task metapackages to our package "
+"list as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:297
+#: en/user_examples.ssi:323
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -758,14 +820,14 @@ msgid ""
" -k 486 \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
-" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
-" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
-" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \\\n"
+" task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:300
+#: en/user_examples.ssi:326
msgid ""
"Note that we have included the debian-installer-launcher package to launch "
"the installer from the live desktop, and have also specified the 486 flavour "
diff --git a/manual/po/pt_BR/user_installation.ssi.po b/manual/po/pt_BR/user_installation.ssi.po
index 5e6ea81..1826b3e 100644
--- a/manual/po/pt_BR/user_installation.ssi.po
+++ b/manual/po/pt_BR/user_installation.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-08 13:49+0300\n"
"PO-Revision-Date: 2010-10-16 20:36-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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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,57 +107,58 @@ 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
msgstr ""
@@ -193,7 +195,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:14
-msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
+msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/"
msgstr ""
#. type: Plain text
@@ -203,7 +205,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:18
-msgid "_* Linux 2.6.x"
+msgid "_* Linux 2.6.x or 3.x"
msgstr ""
#. type: Plain text
@@ -341,7 +343,7 @@ msgid " # make uninstall\n"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:96 en/user_installation.ssi:142
+#: en/user_installation.ssi:96 en/user_installation.ssi:149
msgid "3~ From 'snapshots'"
msgstr ""
@@ -434,7 +436,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:138
-msgid "_* Use all generated .deb files"
+msgid "_* Use applicable generated .deb files"
msgstr ""
#. type: Plain text
@@ -442,14 +444,29 @@ msgstr ""
msgid ""
"As live-boot and live-config are installed by live-build system, installing "
"the packages in the host system is not sufficient: you should treat the "
-"generated .deb files like any other custom packages. Please see {Customizing "
-"package installation}#customizing-package-installation for more information. "
-"You should pay particular attention to {Additional repositories}#additional-"
-"repositories."
+"generated .deb files like any other custom packages. Since your purpose for "
+"building from source is like to test new things over the short term before "
+"the official release, follow {Installing modified or third-party packages}"
+"#installing-modified-or-third-party-packages to temporarily include the "
+"relevant files in your configuration. In particular, notice that both "
+"packages are divided into a generic part, a documentation part and one or "
+"more back-ends. Include the generic part, only one back-end matching your "
+"configuration, and optionally the documentation. Assuming you are building a "
+"live image in the current directory and have generated all .deb files for a "
+"single version of both packages in the directory above, these bash commands "
+"would copy all of the relevant packages including default back-ends:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:145
+#, no-wrap
+msgid ""
+" $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/\n"
+" $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/\n"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:144
+#: en/user_installation.ssi:151
msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
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..5baa8e0 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-07 13:47+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"
@@ -175,133 +177,180 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:8
-msgid "2~ Use auto to manage configuration changes"
+msgid "2~ Dealing with configuration changes"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
msgid ""
-"Live configurations rarely are perfect on the first try. You'll likely need "
-"to make a series of revisions until you are satisfied. However, "
-"inconsistencies can creep into your configuration from one revision to the "
-"next if you aren't careful. The main problem is, once a variable is given a "
-"default value, that value will not be recomputed from other variables that "
-"may change in later revisions."
+"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 use auto scripts? What do they do?"
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 --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 --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 b1bad54..70a5f3a 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-07-27 00:01+0300\n"
+"POT-Creation-Date: 2012-08-10 22:48+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-07-27\n"
+" :published: 2012-08-10\n"
msgstr ""
"@date:\n"
-" :published: 27.07.2012\n"
+" :published: 10.08.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -65,14 +65,14 @@ msgstr "@publisher: Proiectul Debian Live <debian-live at lists.debian.org>"
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /squeeze|wheezy|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|jessie|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
"@make:\n"
-" :bold: /squeeze|wheezy|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|jessie|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
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/style_guide.ssi.po b/manual/po/ro/style_guide.ssi.po
index 47e0830..7d4c8f2 100644
--- a/manual/po/ro/style_guide.ssi.po
+++ b/manual/po/ro/style_guide.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 17:04+0300\n"
+"POT-Creation-Date: 2012-07-31 23:27+0300\n"
"PO-Revision-Date: 2012-02-11 16:42+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -25,7 +25,7 @@ msgstr ":B~ Anexă"
#: 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
@@ -51,33 +51,35 @@ msgstr ":B~ Anexă"
#: 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: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: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:218
+#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
#: 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:350
+#: en/user_customization-packages.ssi:358 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: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_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
@@ -95,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
@@ -120,34 +122,36 @@ msgstr "code{"
#: 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:206
+#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:363 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: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_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
@@ -800,41 +804,21 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:220
msgid ""
-"Some translators decide to include the code blocks in the translated files "
-"because it is easier for them to identify what has already been translated "
-"and what has not by looking at the percentages if they use a graphical "
-"translation program."
+"Even though the code blocks are usually untranslatable, including them in "
+"the translation is the only way to score a 100% complete translation. And "
+"even though it means more work at first because it requires the intervention "
+"of the translators if the code changes, it is the best way, in the long run, "
+"to identify what has already been translated and what has not when checking "
+"the integrity of the .po files."
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:222
-msgid ""
-"Include the code blocks if you want to score a 100% complete translation."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:224
-msgid ""
-"On the other hand some translators prefer to leave the code blocks "
-"\"untranslated\" (i.e. not including them). This makes the translation "
-"easier to maintain once finished because it does not require translators "
-"intervention if the code changes."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:226
-msgid ""
-"Leave the code blocks empty (they will be automatically added then) if you "
-"want to make your translation easier to maintain."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:228
msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:230
+#: en/style_guide.ssi:224
msgid ""
"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
@@ -843,48 +827,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:232
+#: en/style_guide.ssi:226
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:234
+#: en/style_guide.ssi:228
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:236
+#: en/style_guide.ssi:230
msgid "Translators should never translate:"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:238
+#: en/style_guide.ssi:232
msgid "The code names of releases"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:240
+#: en/style_guide.ssi:234
msgid "The names of programs"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:242
+#: en/style_guide.ssi:236
msgid "The commands given as examples"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:244
+#: en/style_guide.ssi:238
msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:246
+#: en/style_guide.ssi:240
msgid "Links"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:247
+#: en/style_guide.ssi:241
msgid "Paths"
msgstr ""
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 e8d908e..98ed5c0 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-04-14 22:45+0300\n"
+"POT-Creation-Date: 2012-08-10 22:48+0300\n"
"PO-Revision-Date: 2010-10-22 08:58-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-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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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-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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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"
@@ -177,10 +179,10 @@ msgid ""
"areas. To ensure decent download speeds, you should choose a nearby "
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
-"can define your own lists of packages to include, use live-build's "
-"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
-"Finally, a number of options give some control over /{apt}/, or if you "
-"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"can define lists of packages, including metapackages which will install many "
+"related packages at once, such as packages for a particular desktop or "
+"language. Finally, a number of options give some control over /{apt}/, or if "
+"you prefer, /{aptitude}/, at build time when packages are installed. You may "
"find these handy if you use a proxy, want to disable installation of "
"recommended packages to save space, or need to control which versions of "
"packages are installed via APT pinning, to name a few possibilities."
@@ -211,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 ""
@@ -383,7 +385,7 @@ msgid "*{Note:}* some preconfigured package repositories are available for easy
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
msgstr ""
@@ -398,10 +400,11 @@ msgstr ""
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"individual packages to install in a package list. You can also choose "
-"predefined lists of packages, or use APT tasks. And finally, you may place "
-"package files in your #{config/}# tree, which is well suited to testing of "
-"new or experimental packages before they are available from a repository."
+"individual packages to install in a package list. You can also use "
+"metapackages in those lists, or select them using package control file "
+"fields. And finally, you may place package files in your #{config/}# tree, "
+"which is well suited to testing of new or experimental packages before they "
+"are available from a repository."
msgstr ""
#. type: Plain text
@@ -415,11 +418,8 @@ msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
"which makes it easy to build lists from other lists and adapt them for use "
-"in multiple configurations. You can use predefined package lists, providing "
-"in a modular fashion package selections from each of the major desktop "
-"environments and some special purpose lists, as well as standard lists the "
-"others are based upon. You can also provide your own package lists, or use a "
-"combination of both."
+"in multiple configurations. Package names may also be injected into the list "
+"using shell helpers at build time."
msgstr ""
#. type: Plain text
@@ -430,45 +430,89 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:97
-msgid "3~ Predefined package lists"
-msgstr ""
+#, fuzzy
+#| msgid "3~ Applying patches"
+msgid "3~using-metapackages Using metapackages"
+msgstr "3~ Aplicarea de patch-uri"
#. type: Plain text
#: en/user_customization-packages.ssi:99
msgid ""
-"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--package-lists}# option. For example:"
+"The simplest way to populate your package list is to use a task metapackage "
+"maintained by your distribution. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:104
+#, no-wrap
+msgid ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:108
+msgid ""
+"This supercedes the older predefined list method supported in #{live-build}# "
+"2.x. Unlike predefined lists, task metapackages are not specific to the "
+"Debian Live project. Instead, they are maintained by specialist working "
+"groups within the distribution and therefore reflect the consensus of each "
+"group about which packages best serve the needs of the intended users. They "
+"also cover a much broader range of use cases than the predefined lists they "
+"replace."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:110
+msgid ""
+"All task metapackages are prefixed #{task-}#, so a quick way to determine "
+"which are available (though it may contain a handful of false hits that "
+"match the name but aren't metapackages) is to match on the package name with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:114
#, no-wrap
-msgid " $ lb config --package-lists \"gnome rescue\"\n"
+msgid " $ apt-cache search --names-only ^task-\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:118
msgid ""
-"The default location for the list files on your system is #{/usr/share/live/"
-"build/package-lists/}#. To determine the packages in a given list, read the "
-"corresponding file, paying attention to included files and conditionals as "
-"described in the following sections."
+"In addition to these, you will find other metapackages with various "
+"purposes. Some are subsets of broader task packages, like #{gnome-core}#, "
+"while others are individual specialized parts of a Debian Pure Blend, such "
+"as the #{education-*}# metapackages. To list all metapackages in the "
+"archive, install the #{debtags}# package and list all packages with the #"
+"{role::metapackage}# tag as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:122
+#, no-wrap
+msgid " $ debtags search role::metapackage\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:128
msgid ""
-"You may supplement the predefined lists using local package lists stored in #"
-"{config/package-lists/}#."
+"Whether you list metapackages, individual packages, or a combination of "
+"both, all local package lists are stored in #{config/package-lists/}#. Since "
+"more than one list can be used, this lends itself well to modular designs. "
+"For example, you may decide to devote one list to a particular choice of "
+"desktop, another to a collection of related packages that might as easily be "
+"used on top of a different desktop. This allows you to experiment with "
+"different combinations of sets of packages with a minimum of fuss, sharing "
+"common lists between different live image projects."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -476,18 +520,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:132
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:134
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:136
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -498,41 +542,46 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "3~ Extending a provided package list using includes"
+#: en/user_customization-packages.ssi:138
+msgid "3~generated-package-lists Generated package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:140
msgid ""
-"The package lists that are included with live-build make extensive use of "
-"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
-"directory, as they serve as good examples of how to write your own 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 "
+"command to be executed within the chroot when the image is built. For "
+"example, one might include the line #{! grep-aptavail -n -sPackage -"
+"FPriority standard | sort}# in a package list to produce a sorted list of "
+"available packages with #{Priority: standard}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:142
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list "
-"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
-"following contents:"
+"In fact, selecting packages with the #{grep-aptavail}# command (from the #"
+"{dctrl-tools}# package) is so useful that #{live-build}# provides a #"
+"{Packages}# helper script as a convenience. This script takes two arguments: "
+"#{field}# and #{pattern}#. Thus, you can create a list with the following "
+"contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
-" #include <gnome>\n"
-" iceweasel\n"
+" $ lb config\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -543,14 +592,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
@@ -559,7 +608,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:165
msgid ""
"You may test for any one of a number of values, e.g. to install /"
"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
@@ -567,7 +616,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURES i386 amd64\n"
@@ -576,7 +625,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:175
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
@@ -584,7 +633,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -593,12 +642,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
@@ -607,51 +656,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:180
-msgid "3~ Tasks"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid ""
-"The Debian Installer offers the user choices of a number of preselected "
-"lists of packages, each one focused on a particular kind of system, or task "
-"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
-"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
-"by APT through the \"Task:\" field. You can specify one or more tasks in "
-"live-build by putting them in a list in #{config/task-lists/}#, as in the "
-"example below."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:187
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:191
-msgid ""
-"The primary tasks available in the Debian Installer can be listed with #"
-"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including the ones not included in this list, may be examined with #{tasksel "
-"--task-packages}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:197
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:199
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -665,7 +680,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:201
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -676,57 +691,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:203
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
"you want them, you need to specify them in your configuration. For example, "
"a GNOME desktop image containing support for Japanese might include these "
-"tasks:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:205
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
-" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
+"task metapackages:"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:209
-msgid ""
-"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value, if it differs from the "
-"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
-"variable or else tasksel will not recognize and install it. Thus:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:214
#, no-wrap
msgid ""
" $ lb config\n"
-" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:218
-msgid ""
-"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
-"\"."
+" $ echo \"task-gnome-desktop task-laptop\" >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-japanese task-japanese-desktop task-japanese-gnome-desktop\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:213
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:215
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -737,7 +728,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:217
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -748,22 +739,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:219
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:221
msgid "_* #{packages.chroot}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:223
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:225
msgid ""
"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
"customizations but has a number of drawbacks, whilst using a custom APT "
@@ -771,12 +762,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:227
msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:229
msgid ""
"To install a custom package, simply copy it to the #{config/packages.chroot/}"
"# directory. Packages that are inside this directory will be automatically "
@@ -785,45 +776,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:231
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:233
msgid ""
"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:235
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:237
msgid ""
"_* You must install all appropriate packages in the #{config/packages."
"chroot/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:239
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:241
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:243
msgid ""
"Unlike using #{packages.chroot}#, when using a custom APT repository you "
"must ensure that you specify the packages elsewhere. See {Choosing packages "
@@ -831,7 +822,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:245
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -839,12 +830,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:247
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:249
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -854,7 +845,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:251
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -864,12 +855,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:253
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:255
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -880,12 +871,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:257
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:259
msgid ""
"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -895,26 +886,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:261
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:263
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:265
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:267
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -922,18 +913,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:271
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:282
-msgid "3~ Tweaking APT to save space"
+#: en/user_customization-packages.ssi:275
+msgid "3~tweaking-apt-to-save-space Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:277
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -941,20 +932,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:279
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:283
#, no-wrap
msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:287
msgid ""
"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
@@ -964,41 +955,56 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:289
msgid ""
"If you find the installation of recommended packages bloats your image too "
-"much, you may disable that default option of APT with:"
+"much, provided you are prepared to deal with the consequences discussed "
+"below, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:293
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:304
+#: en/user_customization-packages.ssi:297
msgid ""
-"The tradeoff here is that if you don't install recommended packages for a "
-"given package, that is, \"packages that would be found together with this "
-"one in all but unusual installations\" (Debian Policy Manual, section 7.2), "
-"some packages that you actually need may be omitted. Therefore, we suggest "
-"you review the difference turning off recommends makes to your packages list "
-"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
-"in your list any missing packages that you still want installed. "
-"Alternatively, if you find you only want a small number of recommended "
-"packages left out, leave recommends enabled and set a negative APT pin "
-"priority on selected packages to prevent them from being installed, as "
-"explained in {APT pinning}#apt-pinning."
+"The most important consequence of turning off recommends is that #{live-boot}"
+"# and #{live-config}# themselves recommend some packages that provide "
+"important functionality used by most Live configurations, such as #{user-"
+"setup}# which #{live-config}# recommends and is used to create the live "
+"user. In all but the most exceptional circumstances you need to add back at "
+"least some of these recommends to your package lists or else your image will "
+"not work as expected, if at all. Look at the recommended packages for each "
+"of the #{live-*}# packages included in your build and if you are not certain "
+"you can omit them, add them back into your package lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:299
+msgid ""
+"The more general consequence is that if you don't install recommended "
+"packages for any given package, that is, \"packages that would be found "
+"together with this one in all but unusual installations\" (Debian Policy "
+"Manual, section 7.2), some packages that users of your Live system actually "
+"need may be omitted. Therefore, we suggest you review the difference turning "
+"off recommends makes to your packages list (see the #{binary.packages}# file "
+"generated by #{lb build}#) and re-include in your list any missing packages "
+"that you still want installed. Alternatively, if you find you only want a "
+"small number of recommended packages left out, leave recommends enabled and "
+"set a negative APT pin priority on selected packages to prevent them from "
+"being installed, as explained in {APT pinning}#apt-pinning."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:301
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:303
msgid ""
"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1007,12 +1013,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:305
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:307
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1021,7 +1027,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:309
msgid ""
"Let's say you are building a wheezy live system but need all the live "
"packages that end up in the binary image to be installed from sid at build "
@@ -1032,7 +1038,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:322
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
@@ -1043,7 +1049,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" Package: *\n"
@@ -1053,31 +1059,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:326
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:330
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:334
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
-"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
-"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
-"{gnome-keyring}/ package. This can be done by adding the following stanza to "
-"#{config/chroot_apt/preferences}#:"
+"package. Suppose you are building an LXDE image using #{task-lxde-desktop}# "
+"in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the "
+"user prompted to store wifi passwords in the keyring. This metapackage "
+"depends on /{lxde-core}/, which recommends /{gksu}/, which in turn "
+"recommends /{gnome-keyring}/. So you want to omit the recommended /{gnome-"
+"keyring}/ package. This can be done by adding the following stanza to #"
+"{config/chroot_apt/preferences}#:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:345
+#: en/user_customization-packages.ssi:340
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index da6e70f..b146f65 100644
--- a/manual/po/ro/user_customization-runtime.ssi.po
+++ b/manual/po/ro/user_customization-runtime.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-07-27 21:48+0300\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -293,8 +293,8 @@ msgstr ""
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 "
+"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:"
@@ -349,7 +349,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ 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"
msgstr ""
#. type: Plain text
@@ -359,10 +359,10 @@ msgid ""
"{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:"
+"# 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:"
msgstr ""
#. type: Plain text
@@ -370,7 +370,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index eb2655b..b0362dd 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-10 22:48+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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:266
#, 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:235
#, 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,85 @@ 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 initial "
+"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:197
+msgid ""
+"As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you "
+"may need to re-add some recommended packages to make your image work "
+"properly."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:199
+msgid "An easy way to list recommends is using /{apt-cache}/. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:203
+#, no-wrap
+msgid " $ apt-cache depends live-config live-boot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
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}#:"
+"In this example we found out that we had to re-include several packages "
+"recommended by live-config and live-boot: #{user-setup}# to make autologin "
+"work and #{sudo}# as an essential program to shutdown the system. Besides, "
+"it could be handy to add #{live-tools}# to be able to copy the image to RAM "
+"and #{eject}# to eventually eject the live media, So:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:211
+msgid ""
+"$ echo \"live-tools user-setup sudo eject\" > config/package-lists/"
+"recommends.list.chroot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:215
+msgid ""
+"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:221
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -585,7 +625,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:224
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -593,7 +633,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:227
#, no-wrap
msgid ""
" exit\n"
@@ -601,92 +641,113 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:231
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:239
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:241
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:243
#, 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:245
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:250
#, 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:254
+msgid ""
+"To make the image work properly, we must re-add, at least, two recommended "
+"packages which are left out by the #{--apt-recommends false}# option. See "
+"{Tweaking APT to save space}#tweaking-apt-to-save-space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:258
+#, no-wrap
+msgid " $ echo \"user-setup sudo\" > config/package-lists/recommends.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:262
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:270
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:272
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."
+"chroot}# hook removes some unused packages and files."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:274
+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:276
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:278
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:280
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -694,7 +755,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:282
msgid ""
"Our initial problem is the discovery of the names of the appropriate "
"language tasks. Currently, live-build cannot help with this. While we might "
@@ -704,18 +765,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:260
+#: en/user_examples.ssi:286
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:264
+#: en/user_examples.ssi:290
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:295
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -723,14 +784,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:299
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:279
+#: en/user_examples.ssi:305
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -739,17 +800,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:309
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
-"latin1 keyboard layout. We will also need to preseed our desktop choice, "
-"\"kde\" so that tasksel will install the correct desktop task, as it differs "
-"from the default (see {Desktop and languages tasks}#desktop-and-language-"
-"tasks). Now let's put the pieces together:"
+"latin1 keyboard layout. Now let's put the pieces together. Recalling from "
+"{Using metapackages}#using-metapackages that task metapackages are prefixed #"
+"{task-}#, we just specify these language boot parameters, then add standard "
+"priority packages and all our discovered task metapackages to our package "
+"list as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:297
+#: en/user_examples.ssi:323
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -759,14 +821,14 @@ msgid ""
" -k 486 \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
-" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
-" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
-" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \\\n"
+" task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:300
+#: en/user_examples.ssi:326
msgid ""
"Note that we have included the debian-installer-launcher package to launch "
"the installer from the live desktop, and have also specified the 486 flavour "
diff --git a/manual/po/ro/user_installation.ssi.po b/manual/po/ro/user_installation.ssi.po
index cba13d6..566265f 100644
--- a/manual/po/ro/user_installation.ssi.po
+++ b/manual/po/ro/user_installation.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-08 13:49+0300\n"
"PO-Revision-Date: 2010-10-23 16:43+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-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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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,57 +108,58 @@ 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
msgstr ""
@@ -194,7 +196,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:14
-msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
+msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/"
msgstr ""
#. type: Plain text
@@ -204,7 +206,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:18
-msgid "_* Linux 2.6.x"
+msgid "_* Linux 2.6.x or 3.x"
msgstr ""
#. type: Plain text
@@ -342,7 +344,7 @@ msgid " # make uninstall\n"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:96 en/user_installation.ssi:142
+#: en/user_installation.ssi:96 en/user_installation.ssi:149
msgid "3~ From 'snapshots'"
msgstr ""
@@ -435,7 +437,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:138
-msgid "_* Use all generated .deb files"
+msgid "_* Use applicable generated .deb files"
msgstr ""
#. type: Plain text
@@ -443,14 +445,29 @@ msgstr ""
msgid ""
"As live-boot and live-config are installed by live-build system, installing "
"the packages in the host system is not sufficient: you should treat the "
-"generated .deb files like any other custom packages. Please see {Customizing "
-"package installation}#customizing-package-installation for more information. "
-"You should pay particular attention to {Additional repositories}#additional-"
-"repositories."
+"generated .deb files like any other custom packages. Since your purpose for "
+"building from source is like to test new things over the short term before "
+"the official release, follow {Installing modified or third-party packages}"
+"#installing-modified-or-third-party-packages to temporarily include the "
+"relevant files in your configuration. In particular, notice that both "
+"packages are divided into a generic part, a documentation part and one or "
+"more back-ends. Include the generic part, only one back-end matching your "
+"configuration, and optionally the documentation. Assuming you are building a "
+"live image in the current directory and have generated all .deb files for a "
+"single version of both packages in the directory above, these bash commands "
+"would copy all of the relevant packages including default back-ends:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:145
+#, no-wrap
+msgid ""
+" $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/\n"
+" $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/\n"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:144
+#: en/user_installation.ssi:151
msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index 4c08186..e77299e 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-07 13:47+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"
@@ -176,133 +178,180 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:8
-msgid "2~ Use auto to manage configuration changes"
+msgid "2~ Dealing with configuration changes"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
msgid ""
-"Live configurations rarely are perfect on the first try. You'll likely need "
-"to make a series of revisions until you are satisfied. However, "
-"inconsistencies can creep into your configuration from one revision to the "
-"next if you aren't careful. The main problem is, once a variable is given a "
-"default value, that value will not be recomputed from other variables that "
-"may change in later revisions."
+"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 use auto scripts? What do they do?"
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 --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 --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 c337bfb..f7a6568 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-07-27 00:01+0300\n"
+"POT-Creation-Date: 2012-08-10 22:48+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-07-27\n"
+" :published: 2012-08-10\n"
msgstr ""
#. type: Plain text
@@ -58,8 +58,8 @@ msgstr ""
#, no-wrap
msgid ""
"@make:\n"
-" :bold: /squeeze|wheezy|sid/\n"
-" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
+" :bold: /squeeze|wheezy|jessie|sid/\n"
+" :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
" :skin: skin_debian-live\n"
msgstr ""
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/style_guide.ssi.pot b/manual/pot/style_guide.ssi.pot
index 740db0e..8952d11 100644
--- a/manual/pot/style_guide.ssi.pot
+++ b/manual/pot/style_guide.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 17:04+0300\n"
+"POT-Creation-Date: 2012-07-31 23:27+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -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
@@ -51,33 +51,35 @@ msgstr ""
#: 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: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: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:218
+#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
#: 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:350
+#: en/user_customization-packages.ssi:358 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: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_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
@@ -95,7 +97,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
@@ -120,34 +122,36 @@ msgstr ""
#: 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:206
+#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:354
+#: en/user_customization-packages.ssi:363 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: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_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
@@ -800,41 +804,21 @@ msgstr ""
#. type: Plain text
#: en/style_guide.ssi:220
msgid ""
-"Some translators decide to include the code blocks in the translated files "
-"because it is easier for them to identify what has already been translated "
-"and what has not by looking at the percentages if they use a graphical "
-"translation program."
+"Even though the code blocks are usually untranslatable, including them in "
+"the translation is the only way to score a 100% complete translation. And "
+"even though it means more work at first because it requires the intervention "
+"of the translators if the code changes, it is the best way, in the long run, "
+"to identify what has already been translated and what has not when checking "
+"the integrity of the .po files."
msgstr ""
#. type: Plain text
#: en/style_guide.ssi:222
-msgid ""
-"Include the code blocks if you want to score a 100% complete translation."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:224
-msgid ""
-"On the other hand some translators prefer to leave the code blocks "
-"\"untranslated\" (i.e. not including them). This makes the translation "
-"easier to maintain once finished because it does not require translators "
-"intervention if the code changes."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:226
-msgid ""
-"Leave the code blocks empty (they will be automatically added then) if you "
-"want to make your translation easier to maintain."
-msgstr ""
-
-#. type: Plain text
-#: en/style_guide.ssi:228
msgid "_* /{Newlines}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:230
+#: en/style_guide.ssi:224
msgid ""
"The translated texts need to have the exact same newlines as the original "
"texts. Be careful to press the \"Enter\" key or type *{\\n}* if they appear "
@@ -843,48 +827,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:232
+#: en/style_guide.ssi:226
msgid ""
"Make no mistake, this does not mean that the translated text needs to have "
"the same length as the English version. That is nearly impossible."
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:234
+#: en/style_guide.ssi:228
msgid "_* /{Untranslatable strings}/"
msgstr ""
#. type: Plain text
-#: en/style_guide.ssi:236
+#: en/style_guide.ssi:230
msgid "Translators should never translate:"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:238
+#: en/style_guide.ssi:232
msgid "The code names of releases"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:240
+#: en/style_guide.ssi:234
msgid "The names of programs"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:242
+#: en/style_guide.ssi:236
msgid "The commands given as examples"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:244
+#: en/style_guide.ssi:238
msgid "Metadata (often between colons *{:metadata:}*)"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:246
+#: en/style_guide.ssi:240
msgid "Links"
msgstr ""
#. type: Bullet: ' - '
-#: en/style_guide.ssi:247
+#: en/style_guide.ssi:241
msgid "Paths"
msgstr ""
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 ff1732a..29565c5 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-04-14 22:45+0300\n"
+"POT-Creation-Date: 2012-08-10 22:48+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-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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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-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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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 ""
@@ -177,10 +179,10 @@ msgid ""
"areas. To ensure decent download speeds, you should choose a nearby "
"distribution mirror. You can also add your own repositories for backports, "
"experimental or custom packages, or include packages directly as files. You "
-"can define your own lists of packages to include, use live-build's "
-"predefined lists, use /{tasksel}/ tasks, or a combination of all three. "
-"Finally, a number of options give some control over /{apt}/, or if you "
-"prefer, /{aptitude}/, at build time when packages are installed. You may "
+"can define lists of packages, including metapackages which will install many "
+"related packages at once, such as packages for a particular desktop or "
+"language. Finally, a number of options give some control over /{apt}/, or if "
+"you prefer, /{aptitude}/, at build time when packages are installed. You may "
"find these handy if you use a proxy, want to disable installation of "
"recommended packages to save space, or need to control which versions of "
"packages are installed via APT pinning, to name a few possibilities."
@@ -211,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 ""
@@ -383,7 +385,7 @@ msgid "*{Note:}* some preconfigured package repositories are available for easy
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
msgstr ""
@@ -398,10 +400,11 @@ msgstr ""
msgid ""
"There are a number of ways to choose which packages live-build will install "
"in your image, covering a variety of different needs. You can simply name "
-"individual packages to install in a package list. You can also choose "
-"predefined lists of packages, or use APT tasks. And finally, you may place "
-"package files in your #{config/}# tree, which is well suited to testing of "
-"new or experimental packages before they are available from a repository."
+"individual packages to install in a package list. You can also use "
+"metapackages in those lists, or select them using package control file "
+"fields. And finally, you may place package files in your #{config/}# tree, "
+"which is well suited to testing of new or experimental packages before they "
+"are available from a repository."
msgstr ""
#. type: Plain text
@@ -415,11 +418,8 @@ msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. The list syntax supports included files and conditional sections "
"which makes it easy to build lists from other lists and adapt them for use "
-"in multiple configurations. You can use predefined package lists, providing "
-"in a modular fashion package selections from each of the major desktop "
-"environments and some special purpose lists, as well as standard lists the "
-"others are based upon. You can also provide your own package lists, or use a "
-"combination of both."
+"in multiple configurations. Package names may also be injected into the list "
+"using shell helpers at build time."
msgstr ""
#. type: Plain text
@@ -430,45 +430,87 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:97
-msgid "3~ Predefined package lists"
+msgid "3~using-metapackages Using metapackages"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:99
msgid ""
-"The simplest way to use lists is to specify one or more predefined lists "
-"with the #{--package-lists}# option. For example:"
+"The simplest way to populate your package list is to use a task metapackage "
+"maintained by your distribution. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:103
+#: en/user_customization-packages.ssi:104
#, no-wrap
-msgid " $ lb config --package-lists \"gnome rescue\"\n"
+msgid ""
+" $ lb config\n"
+" $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:108
+msgid ""
+"This supercedes the older predefined list method supported in #{live-build}# "
+"2.x. Unlike predefined lists, task metapackages are not specific to the "
+"Debian Live project. Instead, they are maintained by specialist working "
+"groups within the distribution and therefore reflect the consensus of each "
+"group about which packages best serve the needs of the intended users. They "
+"also cover a much broader range of use cases than the predefined lists they "
+"replace."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:107
+#: en/user_customization-packages.ssi:110
msgid ""
-"The default location for the list files on your system is #{/usr/share/live/"
-"build/package-lists/}#. To determine the packages in a given list, read the "
-"corresponding file, paying attention to included files and conditionals as "
-"described in the following sections."
+"All task metapackages are prefixed #{task-}#, so a quick way to determine "
+"which are available (though it may contain a handful of false hits that "
+"match the name but aren't metapackages) is to match on the package name with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:109
+#: en/user_customization-packages.ssi:114
+#, no-wrap
+msgid " $ apt-cache search --names-only ^task-\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:118
+msgid ""
+"In addition to these, you will find other metapackages with various "
+"purposes. Some are subsets of broader task packages, like #{gnome-core}#, "
+"while others are individual specialized parts of a Debian Pure Blend, such "
+"as the #{education-*}# metapackages. To list all metapackages in the "
+"archive, install the #{debtags}# package and list all packages with the #"
+"{role::metapackage}# tag as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:122
+#, no-wrap
+msgid " $ debtags search role::metapackage\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:111
+#: en/user_customization-packages.ssi:128
msgid ""
-"You may supplement the predefined lists using local package lists stored in #"
-"{config/package-lists/}#."
+"Whether you list metapackages, individual packages, or a combination of "
+"both, all local package lists are stored in #{config/package-lists/}#. Since "
+"more than one list can be used, this lends itself well to modular designs. "
+"For example, you may decide to devote one list to a particular choice of "
+"desktop, another to a collection of related packages that might as easily be "
+"used on top of a different desktop. This allows you to experiment with "
+"different combinations of sets of packages with a minimum of fuss, sharing "
+"common lists between different live image projects."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -476,18 +518,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:132
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:134
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:136
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -498,41 +540,46 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
-msgid "3~ Extending a provided package list using includes"
+#: en/user_customization-packages.ssi:138
+msgid "3~generated-package-lists Generated package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:140
msgid ""
-"The package lists that are included with live-build make extensive use of "
-"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
-"directory, as they serve as good examples of how to write your own 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 "
+"command to be executed within the chroot when the image is built. For "
+"example, one might include the line #{! grep-aptavail -n -sPackage -"
+"FPriority standard | sort}# in a package list to produce a sorted list of "
+"available packages with #{Priority: standard}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:142
msgid ""
-"For example, to make a list that includes the predefined #{gnome}# list "
-"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the "
-"following contents:"
+"In fact, selecting packages with the #{grep-aptavail}# command (from the #"
+"{dctrl-tools}# package) is so useful that #{live-build}# provides a #"
+"{Packages}# helper script as a convenience. This script takes two arguments: "
+"#{field}# and #{pattern}#. Thus, you can create a list with the following "
+"contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
-" #include <gnome>\n"
-" iceweasel\n"
+" $ lb config\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -543,14 +590,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
@@ -559,7 +606,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:165
msgid ""
"You may test for any one of a number of values, e.g. to install /"
"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
@@ -567,7 +614,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:154
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURES i386 amd64\n"
@@ -576,7 +623,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:175
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
@@ -584,7 +631,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:164
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -593,12 +640,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:174
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURES amd64\n"
@@ -607,51 +654,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:180
-msgid "3~ Tasks"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:182
-msgid ""
-"The Debian Installer offers the user choices of a number of preselected "
-"lists of packages, each one focused on a particular kind of system, or task "
-"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
-"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
-"by APT through the \"Task:\" field. You can specify one or more tasks in "
-"live-build by putting them in a list in #{config/task-lists/}#, as in the "
-"example below."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:187
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:191
-msgid ""
-"The primary tasks available in the Debian Installer can be listed with #"
-"{tasksel --list-tasks}# in the live system. The contents of any task, "
-"including the ones not included in this list, may be examined with #{tasksel "
-"--task-packages}#."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:197
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:199
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -665,7 +678,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:201
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -676,57 +689,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:203
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
"you want them, you need to specify them in your configuration. For example, "
"a GNOME desktop image containing support for Japanese might include these "
-"tasks:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:205
-#, no-wrap
-msgid ""
-" $ lb config\n"
-" $ echo \"gnome-desktop desktop standard laptop\" >> config/task-lists/my.list.chroot\n"
-" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
+"task metapackages:"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:209
-msgid ""
-"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value, if it differs from the "
-"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
-"variable or else tasksel will not recognize and install it. Thus:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:214
#, no-wrap
msgid ""
" $ lb config\n"
-" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:218
-msgid ""
-"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
-"\"."
+" $ echo \"task-gnome-desktop task-laptop\" >> config/package-lists/my.list.chroot\n"
+" $ echo \"task-japanese task-japanese-desktop task-japanese-gnome-desktop\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:220
+#: en/user_customization-packages.ssi:213
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:215
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -737,7 +726,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:217
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -748,22 +737,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:219
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:221
msgid "_* #{packages.chroot}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:223
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:225
msgid ""
"Using #{packages.chroot}# is simpler to achieve and useful for \"one-off\" "
"customizations but has a number of drawbacks, whilst using a custom APT "
@@ -771,12 +760,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:227
msgid "3~ Using #{packages.chroot}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:229
msgid ""
"To install a custom package, simply copy it to the #{config/packages.chroot/}"
"# directory. Packages that are inside this directory will be automatically "
@@ -785,45 +774,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:231
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:233
msgid ""
"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:235
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:237
msgid ""
"_* You must install all appropriate packages in the #{config/packages."
"chroot/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:239
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:241
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:243
msgid ""
"Unlike using #{packages.chroot}#, when using a custom APT repository you "
"must ensure that you specify the packages elsewhere. See {Choosing packages "
@@ -831,7 +820,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:245
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -839,12 +828,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:247
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:249
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -854,7 +843,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:251
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -864,12 +853,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:253
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:255
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -880,12 +869,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:257
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:259
msgid ""
"You can elect to use either /{apt}/ or /{aptitude}/ when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -895,26 +884,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:261
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:263
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:265
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:267
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -922,18 +911,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:271
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:282
-msgid "3~ Tweaking APT to save space"
+#: en/user_customization-packages.ssi:275
+msgid "3~tweaking-apt-to-save-space Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:284
+#: en/user_customization-packages.ssi:277
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -941,20 +930,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:279
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:283
#, no-wrap
msgid " $ lb config --apt-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:287
msgid ""
"This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
"whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
@@ -964,41 +953,56 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:296
+#: en/user_customization-packages.ssi:289
msgid ""
"If you find the installation of recommended packages bloats your image too "
-"much, you may disable that default option of APT with:"
+"much, provided you are prepared to deal with the consequences discussed "
+"below, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:293
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:304
+#: en/user_customization-packages.ssi:297
msgid ""
-"The tradeoff here is that if you don't install recommended packages for a "
-"given package, that is, \"packages that would be found together with this "
-"one in all but unusual installations\" (Debian Policy Manual, section 7.2), "
-"some packages that you actually need may be omitted. Therefore, we suggest "
-"you review the difference turning off recommends makes to your packages list "
-"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
-"in your list any missing packages that you still want installed. "
-"Alternatively, if you find you only want a small number of recommended "
-"packages left out, leave recommends enabled and set a negative APT pin "
-"priority on selected packages to prevent them from being installed, as "
-"explained in {APT pinning}#apt-pinning."
+"The most important consequence of turning off recommends is that #{live-boot}"
+"# and #{live-config}# themselves recommend some packages that provide "
+"important functionality used by most Live configurations, such as #{user-"
+"setup}# which #{live-config}# recommends and is used to create the live "
+"user. In all but the most exceptional circumstances you need to add back at "
+"least some of these recommends to your package lists or else your image will "
+"not work as expected, if at all. Look at the recommended packages for each "
+"of the #{live-*}# packages included in your build and if you are not certain "
+"you can omit them, add them back into your package lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:306
+#: en/user_customization-packages.ssi:299
+msgid ""
+"The more general consequence is that if you don't install recommended "
+"packages for any given package, that is, \"packages that would be found "
+"together with this one in all but unusual installations\" (Debian Policy "
+"Manual, section 7.2), some packages that users of your Live system actually "
+"need may be omitted. Therefore, we suggest you review the difference turning "
+"off recommends makes to your packages list (see the #{binary.packages}# file "
+"generated by #{lb build}#) and re-include in your list any missing packages "
+"that you still want installed. Alternatively, if you find you only want a "
+"small number of recommended packages left out, leave recommends enabled and "
+"set a negative APT pin priority on selected packages to prevent them from "
+"being installed, as explained in {APT pinning}#apt-pinning."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:301
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:303
msgid ""
"If there is not a #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1007,12 +1011,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:305
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:307
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1021,7 +1025,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:309
msgid ""
"Let's say you are building a wheezy live system but need all the live "
"packages that end up in the binary image to be installed from sid at build "
@@ -1032,7 +1036,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:322
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
@@ -1043,7 +1047,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" Package: *\n"
@@ -1053,31 +1057,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:326
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with wheezy using:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:330
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:334
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
-"package. Suppose you are building an LXDE image using #{--package-lists lxde}"
-"# option, but don't want the user prompted to store wifi passwords in the "
-"keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in "
-"turn recommends /{gnome-keyring}/. So you want to omit the recommended /"
-"{gnome-keyring}/ package. This can be done by adding the following stanza to "
-"#{config/chroot_apt/preferences}#:"
+"package. Suppose you are building an LXDE image using #{task-lxde-desktop}# "
+"in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the "
+"user prompted to store wifi passwords in the keyring. This metapackage "
+"depends on /{lxde-core}/, which recommends /{gksu}/, which in turn "
+"recommends /{gnome-keyring}/. So you want to omit the recommended /{gnome-"
+"keyring}/ package. This can be done by adding the following stanza to #"
+"{config/chroot_apt/preferences}#:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:345
+#: en/user_customization-packages.ssi:340
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index 9ed0b42..81c8b66 100644
--- a/manual/pot/user_customization-runtime.ssi.pot
+++ b/manual/pot/user_customization-runtime.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"POT-Creation-Date: 2012-07-27 21:48+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"
@@ -293,8 +293,8 @@ msgstr ""
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 "
+"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:"
@@ -349,7 +349,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ 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"
msgstr ""
#. type: Plain text
@@ -359,10 +359,10 @@ msgid ""
"{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:"
+"# 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:"
msgstr ""
#. type: Plain text
@@ -370,7 +370,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
+" \"keyboard-layouts=us,us keyboard-variants=,dvorak\"\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index bb72093..18e6e8e 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-10 22:48+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:269
+#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:328
+#: en/user_customization-packages.ssi:336 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:201 en/user_examples.ssi:209
+#: en/user_examples.ssi:217 en/user_examples.ssi:233 en/user_examples.ssi:247
+#: en/user_examples.ssi:256 en/user_examples.ssi:264 en/user_examples.ssi:284
+#: en/user_examples.ssi:292 en/user_examples.ssi:301 en/user_examples.ssi:311
#: 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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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:273
+#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:295
+#: en/user_customization-packages.ssi:324
+#: en/user_customization-packages.ssi:332
+#: en/user_customization-packages.ssi:341 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:205 en/user_examples.ssi:213
+#: en/user_examples.ssi:229 en/user_examples.ssi:237 en/user_examples.ssi:252
+#: en/user_examples.ssi:260 en/user_examples.ssi:268 en/user_examples.ssi:288
+#: en/user_examples.ssi:297 en/user_examples.ssi:307 en/user_examples.ssi:325
#: 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:266
#, 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:235
#, 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,85 @@ 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 initial "
+"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:197
+msgid ""
+"As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you "
+"may need to re-add some recommended packages to make your image work "
+"properly."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:199
+msgid "An easy way to list recommends is using /{apt-cache}/. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:203
+#, no-wrap
+msgid " $ apt-cache depends live-config live-boot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:207
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}#:"
+"In this example we found out that we had to re-include several packages "
+"recommended by live-config and live-boot: #{user-setup}# to make autologin "
+"work and #{sudo}# as an essential program to shutdown the system. Besides, "
+"it could be handy to add #{live-tools}# to be able to copy the image to RAM "
+"and #{eject}# to eventually eject the live media, So:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:211
+msgid ""
+"$ echo \"live-tools user-setup sudo eject\" > config/package-lists/"
+"recommends.list.chroot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:215
+msgid ""
+"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:221
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -585,7 +625,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:208
+#: en/user_examples.ssi:224
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -593,7 +633,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:227
#, no-wrap
msgid ""
" exit\n"
@@ -601,92 +641,113 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:231
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:239
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:241
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:243
#, 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:245
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:250
#, 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:254
+msgid ""
+"To make the image work properly, we must re-add, at least, two recommended "
+"packages which are left out by the #{--apt-recommends false}# option. See "
+"{Tweaking APT to save space}#tweaking-apt-to-save-space"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:258
+#, no-wrap
+msgid " $ echo \"user-setup sudo\" > config/package-lists/recommends.list.chroot\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:262
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:246
+#: en/user_examples.ssi:270
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:272
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."
+"chroot}# hook removes some unused packages and files."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:274
+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:276
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:278
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:280
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -694,7 +755,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:282
msgid ""
"Our initial problem is the discovery of the names of the appropriate "
"language tasks. Currently, live-build cannot help with this. While we might "
@@ -704,18 +765,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:260
+#: en/user_examples.ssi:286
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:264
+#: en/user_examples.ssi:290
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:295
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -723,14 +784,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:273
+#: en/user_examples.ssi:299
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:279
+#: en/user_examples.ssi:305
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -739,17 +800,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:309
msgid ""
"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
-"latin1 keyboard layout. We will also need to preseed our desktop choice, "
-"\"kde\" so that tasksel will install the correct desktop task, as it differs "
-"from the default (see {Desktop and languages tasks}#desktop-and-language-"
-"tasks). Now let's put the pieces together:"
+"latin1 keyboard layout. Now let's put the pieces together. Recalling from "
+"{Using metapackages}#using-metapackages that task metapackages are prefixed #"
+"{task-}#, we just specify these language boot parameters, then add standard "
+"priority packages and all our discovered task metapackages to our package "
+"list as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:297
+#: en/user_examples.ssi:323
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -759,14 +821,14 @@ msgid ""
" -k 486 \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
-" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
-" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
-" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
+" $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot\n"
+" $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \\\n"
+" task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot\n"
+" $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:300
+#: en/user_examples.ssi:326
msgid ""
"Note that we have included the debian-installer-launcher package to launch "
"the installer from the live desktop, and have also specified the 486 flavour "
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index f6f919b..fd0d485 100644
--- a/manual/pot/user_installation.ssi.pot
+++ b/manual/pot/user_installation.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-16 18:50+0300\n"
+"POT-Creation-Date: 2012-08-08 13: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_installation.ssi:129 en/user_installation.ssi:142
+#: en/user_installation.ssi:153 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,57 +108,58 @@ 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_installation.ssi:136 en/user_installation.ssi:147
+#: en/user_installation.ssi:156 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:83 en/user_installation.ssi:148
+#: en/user_customization-packages.ssi:83 en/user_installation.ssi:155
#, no-wrap
msgid " $ lb config --archives live.debian.net\n"
msgstr ""
@@ -194,7 +196,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:14
-msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
+msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/"
msgstr ""
#. type: Plain text
@@ -204,7 +206,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:18
-msgid "_* Linux 2.6.x"
+msgid "_* Linux 2.6.x or 3.x"
msgstr ""
#. type: Plain text
@@ -342,7 +344,7 @@ msgid " # make uninstall\n"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:96 en/user_installation.ssi:142
+#: en/user_installation.ssi:96 en/user_installation.ssi:149
msgid "3~ From 'snapshots'"
msgstr ""
@@ -435,7 +437,7 @@ msgstr ""
#. type: Plain text
#: en/user_installation.ssi:138
-msgid "_* Use all generated .deb files"
+msgid "_* Use applicable generated .deb files"
msgstr ""
#. type: Plain text
@@ -443,14 +445,29 @@ msgstr ""
msgid ""
"As live-boot and live-config are installed by live-build system, installing "
"the packages in the host system is not sufficient: you should treat the "
-"generated .deb files like any other custom packages. Please see {Customizing "
-"package installation}#customizing-package-installation for more information. "
-"You should pay particular attention to {Additional repositories}#additional-"
-"repositories."
+"generated .deb files like any other custom packages. Since your purpose for "
+"building from source is like to test new things over the short term before "
+"the official release, follow {Installing modified or third-party packages}"
+"#installing-modified-or-third-party-packages to temporarily include the "
+"relevant files in your configuration. In particular, notice that both "
+"packages are divided into a generic part, a documentation part and one or "
+"more back-ends. Include the generic part, only one back-end matching your "
+"configuration, and optionally the documentation. Assuming you are building a "
+"live image in the current directory and have generated all .deb files for a "
+"single version of both packages in the directory above, these bash commands "
+"would copy all of the relevant packages including default back-ends:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:145
+#, no-wrap
+msgid ""
+" $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/\n"
+" $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/\n"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:144
+#: en/user_installation.ssi:151
msgid ""
"You can let live-build automatically use the latest snapshots of live-boot "
"and live-config by configuring a third-party repository in your live-build "
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index cf4e129..3d446e9 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-07 13:47+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 ""
@@ -176,133 +178,180 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:8
-msgid "2~ Use auto to manage configuration changes"
+msgid "2~ Dealing with configuration changes"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
msgid ""
-"Live configurations rarely are perfect on the first try. You'll likely need "
-"to make a series of revisions until you are satisfied. However, "
-"inconsistencies can creep into your configuration from one revision to the "
-"next if you aren't careful. The main problem is, once a variable is given a "
-"default value, that value will not be recomputed from other variables that "
-"may change in later revisions."
+"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 use auto scripts? What do they do?"
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 --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 --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 769bda2..0456a5e 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,13 +9,13 @@
: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: 27-07-2012
+ :published: 2012-08-10
@publisher: Debian Live Project <debian-live at lists.debian.org>
@make:
- :bold: /squeeze|wheezy|sid/
- :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|jessie|sid/
+ :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
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/style_guide.ssi b/manual/pt_BR/style_guide.ssi
index edd8e20..79a9560 100644
--- a/manual/pt_BR/style_guide.ssi
+++ b/manual/pt_BR/style_guide.ssi
@@ -327,20 +327,12 @@ that they use exactly the same markup as the original English version.
_* /{Code blocks}/
-Some translators decide to include the code blocks in the translated files
-because it is easier for them to identify what has already been translated
-and what has not by looking at the percentages if they use a graphical
-translation program.
-
-Include the code blocks if you want to score a 100% complete translation.
-
-On the other hand some translators prefer to leave the code blocks
-"untranslated" (i.e. not including them). This makes the translation easier
-to maintain once finished because it does not require translators
-intervention if the code changes.
-
-Leave the code blocks empty (they will be automatically added then) if you
-want to make your translation easier to maintain.
+Even though the code blocks are usually untranslatable, including them in
+the translation is the only way to score a 100% complete translation. And
+even though it means more work at first because it requires the intervention
+of the translators if the code changes, it is the best way, in the long run,
+to identify what has already been translated and what has not when checking
+the integrity of the .po files.
_* /{Newlines}/
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 eb3724f..53f2c76 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -10,9 +10,9 @@ are available to install in the image are the distribution and archive
areas. To ensure decent download speeds, you should choose a nearby
distribution mirror. You can also add your own repositories for backports,
experimental or custom packages, or include packages directly as files. You
-can define your own lists of packages to include, use live-build's
-predefined lists, use /{tasksel}/ tasks, or a combination of all
-three. Finally, a number of options give some control over /{apt}/, or if
+can define lists of packages, including metapackages which will install many
+related packages at once, such as packages for a particular desktop or
+language. Finally, a number of options give some control over /{apt}/, or if
you prefer, /{aptitude}/, at build time when packages are installed. You may
find these handy if you use a proxy, want to disable installation of
recommended packages to save space, or need to control which versions of
@@ -148,44 +148,76 @@ code{
There are a number of ways to choose which packages live-build will install
in your image, covering a variety of different needs. You can simply name
-individual packages to install in a package list. You can also choose
-predefined lists of packages, or use APT tasks. And finally, you may place
-package files in your #{config/}# tree, which is well suited to testing of
-new or experimental packages before they are available from a repository.
+individual packages to install in a package list. You can also use
+metapackages in those lists, or select them using package control file
+fields. And finally, you may place package files in your #{config/}# tree,
+which is well suited to testing of new or experimental packages before they
+are available from a repository.
3~package-lists Package lists
Package lists are a powerful way of expressing which packages should be
installed. The list syntax supports included files and conditional sections
which makes it easy to build lists from other lists and adapt them for use
-in multiple configurations. You can use predefined package lists, providing
-in a modular fashion package selections from each of the major desktop
-environments and some special purpose lists, as well as standard lists the
-others are based upon. You can also provide your own package lists, or use a
-combination of both.
+in multiple configurations. Package names may also be injected into the list
+using shell helpers at build time.
*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.
-3~ Predefined package lists
+3~using-metapackages Using metapackages
-The simplest way to use lists is to specify one or more predefined lists
-with the #{--package-lists}# option. For example:
+The simplest way to populate your package list is to use a task metapackage
+maintained by your distribution. For example:
code{
- $ lb config --package-lists "gnome rescue"
+ $ lb config
+ $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot
+
+}code
+
+This supercedes the older predefined list method supported in #{live-build}#
+2.x. Unlike predefined lists, task metapackages are not specific to the
+Debian Live project. Instead, they are maintained by specialist working
+groups within the distribution and therefore reflect the consensus of each
+group about which packages best serve the needs of the intended users. They
+also cover a much broader range of use cases than the predefined lists they
+replace.
+
+All task metapackages are prefixed #{task-}#, so a quick way to determine
+which are available (though it may contain a handful of false hits that
+match the name but aren't metapackages) is to match on the package name
+with:
+
+code{
+
+ $ apt-cache search --names-only ^task-
}code
-The default location for the list files on your system is
-#{/usr/share/live/build/package-lists/}#. To determine the packages in a
-given list, read the corresponding file, paying attention to included files
-and conditionals as described in the following sections.
+In addition to these, you will find other metapackages with various
+purposes. Some are subsets of broader task packages, like #{gnome-core}#,
+while others are individual specialized parts of a Debian Pure Blend, such
+as the #{education-*}# metapackages. To list all metapackages in the
+archive, install the #{debtags}# package and list all packages with the
+#{role::metapackage}# tag as follows:
+
+code{
+
+ $ debtags search role::metapackage
+
+}code
3~ Local package lists
-You may supplement the predefined lists using local package lists stored in
-#{config/package-lists/}#.
+Whether you list metapackages, individual packages, or a combination of
+both, all local package lists are stored in #{config/package-lists/}#. Since
+more than one list can be used, this lends itself well to modular
+designs. For example, you may decide to devote one list to a particular
+choice of desktop, another to a collection of related packages that might as
+easily be used on top of a different desktop. This allows you to experiment
+with different combinations of sets of packages with a minimum of fuss,
+sharing common lists between different live image projects.
Package lists that exist in this directory need to have a #{.list}# suffix
in order to be processed, and then an additional stage suffix, #{.chroot}#
@@ -202,20 +234,25 @@ 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~ Extending a provided package list using includes
+3~generated-package-lists Generated package lists
-The package lists that are included with live-build make extensive use of
-includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
-directory, as they serve as good examples of how to write your own 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
+command to be executed within the chroot when the image is built. For
+example, one might include the line #{! grep-aptavail -n -sPackage
+-FPriority standard | sort}# in a package list to produce a sorted list of
+available packages with #{Priority: standard}#.
-For example, to make a list that includes the predefined #{gnome}# list plus
-/{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the
+In fact, selecting packages with the #{grep-aptavail}# command (from the
+#{dctrl-tools}# package) is so useful that #{live-build}# provides a
+#{Packages}# helper script as a convenience. This script takes two
+arguments: #{field}# and #{pattern}#. Thus, you can create a list with the
following contents:
code{
- #include <gnome>
- iceweasel
+ $ lb config
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
}code
@@ -275,28 +312,6 @@ code{
The nesting of conditionals is not supported.
-3~ Tasks
-
-The Debian Installer offers the user choices of a number of preselected
-lists of packages, each one focused on a particular kind of system, or task
-a system may be used for, such as "Graphical desktop environment", "Mail
-server" or "Laptop". These lists are called "tasks" and are supported by APT
-through the "Task:" field. You can specify one or more tasks in live-build
-by putting them in a list in #{config/task-lists/}#, as in the example
-below.
-
-code{
-
- $ lb config
- $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
-
-}code
-
-The primary tasks available in the Debian Installer can be listed with
-#{tasksel --list-tasks}# in the live system. The contents of any task,
-including the ones not included in this list, may be examined with #{tasksel
---task-packages}#.
-
3~desktop-and-language-tasks Desktop and language tasks
Desktop and language tasks are special cases that need some extra planning
@@ -320,30 +335,16 @@ Because there is no provision made automatically for language tasks, which
include such things as language-specific fonts and input-method packages, if
you want them, you need to specify them in your configuration. For example,
a GNOME desktop image containing support for Japanese might include these
-tasks:
+task metapackages:
code{
$ lb config
- $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
- $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
+ $ echo "task-gnome-desktop task-laptop" >> config/package-lists/my.list.chroot
+ $ echo "task-japanese task-japanese-desktop task-japanese-gnome-desktop" >> config/package-lists/my.list.chroot
}code
-Since desktop tasks are "internal" tasks, for every desktop flavour task
-included in the image, the corresponding value, if it differs from the
-default, "gnome", must be preseeded in the "tasksel/desktop" debconf
-variable or else tasksel will not recognize and install it. Thus:
-
-code{
-
- $ lb config
- $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
-
-}code
-
-This parameter can take multiple values, e.g. "lxde xfce" instead of "kde".
-
2~installing-modified-or-third-party-packages Installing modified or
third-party packages
@@ -451,7 +452,7 @@ code{
}code
-3~ Tweaking APT to save space
+3~tweaking-apt-to-save-space Tweaking APT to save space
You may find yourself needing to save some space on the image media, in
which case one or the other or both of the following options may be of
@@ -473,7 +474,8 @@ before performing #{apt-cache search}# or #{apt-get install}#, for instance,
the user must #{apt-get update}# first to create those indices.
If you find the installation of recommended packages bloats your image too
-much, you may disable that default option of APT with:
+much, provided you are prepared to deal with the consequences discussed
+below, you may disable that default option of APT with:
code{
@@ -481,17 +483,27 @@ code{
}code
-The tradeoff here is that if you don't install recommended packages for a
-given package, that is, "packages that would be found together with this one
-in all but unusual installations" (Debian Policy Manual, section 7.2), some
-packages that you actually need may be omitted. Therefore, we suggest you
-review the difference turning off recommends makes to your packages list
-(see the #{binary.packages}# file generated by #{lb build}#) and re-include
-in your list any missing packages that you still want
-installed. Alternatively, if you find you only want a small number of
-recommended packages left out, leave recommends enabled and set a negative
-APT pin priority on selected packages to prevent them from being installed,
-as explained in {APT pinning}#apt-pinning.
+The most important consequence of turning off recommends is that
+#{live-boot}# and #{live-config}# themselves recommend some packages that
+provide important functionality used by most Live configurations, such as
+#{user-setup}# which #{live-config}# recommends and is used to create the
+live user. In all but the most exceptional circumstances you need to add
+back at least some of these recommends to your package lists or else your
+image will not work as expected, if at all. Look at the recommended packages
+for each of the #{live-*}# packages included in your build and if you are
+not certain you can omit them, add them back into your package lists.
+
+The more general consequence is that if you don't install recommended
+packages for any given package, that is, "packages that would be found
+together with this one in all but unusual installations" (Debian Policy
+Manual, section 7.2), some packages that users of your Live system actually
+need may be omitted. Therefore, we suggest you review the difference turning
+off recommends makes to your packages list (see the #{binary.packages}# file
+generated by #{lb build}#) and re-include in your list any missing packages
+that you still want installed. Alternatively, if you find you only want a
+small number of recommended packages left out, leave recommends enabled and
+set a negative APT pin priority on selected packages to prevent them from
+being installed, as explained in {APT pinning}#apt-pinning.
3~ Passing options to apt or aptitude
@@ -539,10 +551,11 @@ $ lb config --distribution wheezy
Negative pin priorities will prevent a package from being installed, as in
the case where you do not want a package that is recommended by another
-package. Suppose you are building an LXDE image using #{--package-lists
-lxde}# option, but don't want the user prompted to store wifi passwords in
-the keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in
-turn recommends /{gnome-keyring}/. So you want to omit the recommended
+package. Suppose you are building an LXDE image using #{task-lxde-desktop}#
+in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the
+user prompted to store wifi passwords in the keyring. This metapackage
+depends on /{lxde-core}/, which recommends /{gksu}/, which in turn
+recommends /{gnome-keyring}/. So you want to omit the recommended
/{gnome-keyring}/ package. This can be done by adding the following stanza
to #{config/chroot_apt/preferences}#:
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index 47d89df..4bae885 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -76,7 +76,7 @@ encoding for each can be found in #{/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-variant}#, #{keyboard-options}# and
+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
@@ -117,7 +117,7 @@ layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
}code
@@ -125,8 +125,8 @@ 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
+#{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:
@@ -134,7 +134,7 @@ Dvorak, use:
code{
$ lb config --bootappend-live \
- "keyboard-layouts=us,us keyboard-variant=,dvorak"
+ "keyboard-layouts=us,us keyboard-variants=,dvorak"
}code
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index f506833..14602b4 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,52 @@ 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 initial
+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}#:
+As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you
+may need to re-add some recommended packages to make your image work
+properly.
+
+An easy way to list recommends is using /{apt-cache}/. For example:
+
+code{
+
+ $ apt-cache depends live-config live-boot
+
+}code
+
+In this example we found out that we had to re-include several packages
+recommended by live-config and live-boot: #{user-setup}# to make autologin
+work and #{sudo}# as an essential program to shutdown the system. Besides,
+it could be handy to add #{live-tools}# to be able to copy the image to RAM
+and #{eject}# to eventually eject the live media, So:
+
+code{
+
+$ echo "live-tools user-setup sudo eject" >
+config/package-lists/recommends.list.chroot
+
+}code
+
+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 +314,31 @@ 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 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
+
+}code
+
+To make the image work properly, we must re-add, at least, two recommended
+packages which are left out by the #{--apt-recommends false}# option. See
+{Tweaking APT to save space}#tweaking-apt-to-save-space
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ echo "user-setup sudo" > config/package-lists/recommends.list.chroot
}code
@@ -314,23 +350,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.chroot}# 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
@@ -373,10 +413,11 @@ code{
}code
At boot time we will generate the pt_BR.UTF-8 locale and select the
-pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
-"kde" so that tasksel will install the correct desktop task, as it differs
-from the default (see {Desktop and languages
-tasks}#desktop-and-language-tasks). Now let's put the pieces together:
+pt-latin1 keyboard layout. Now let's put the pieces together. Recalling from
+{Using metapackages}#using-metapackages that task metapackages are prefixed
+#{task-}#, we just specify these language boot parameters, then add standard
+priority packages and all our discovered task metapackages to our package
+list as follows:
code{
@@ -387,10 +428,10 @@ code{
-k 486 \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
- brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
- $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
- $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \
+ task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot
}code
diff --git a/manual/pt_BR/user_installation.ssi b/manual/pt_BR/user_installation.ssi
index 2a28091..e0267f4 100644
--- a/manual/pt_BR/user_installation.ssi
+++ b/manual/pt_BR/user_installation.ssi
@@ -10,11 +10,11 @@ _* Super user (root) access
_* An up-to-date version of live-build
-_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/.
+_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/
_* /{debootstrap}/ or /{cdebootstrap}/
-_* Linux 2.6.x
+_* Linux 2.6.x or 3.x
Note that using Debian or a Debian-derived distribution is not required -
live-build will run on almost any distribution with the above requirements.
@@ -151,14 +151,28 @@ code{
}code
-_* Use all generated .deb files
+_* Use applicable generated .deb files
As live-boot and live-config are installed by live-build system, installing
the packages in the host system is not sufficient: you should treat the
-generated .deb files like any other custom packages. Please see {Customizing
-package installation}#customizing-package-installation for more
-information. You should pay particular attention to {Additional
-repositories}#additional-repositories.
+generated .deb files like any other custom packages. Since your purpose for
+building from source is like to test new things over the short term before
+the official release, follow {Installing modified or third-party
+packages}#installing-modified-or-third-party-packages to temporarily include
+the relevant files in your configuration. In particular, notice that both
+packages are divided into a generic part, a documentation part and one or
+more back-ends. Include the generic part, only one back-end matching your
+configuration, and optionally the documentation. Assuming you are building a
+live image in the current directory and have generated all .deb files for a
+single version of both packages in the directory above, these bash commands
+would copy all of the relevant packages including default back-ends:
+
+code{
+
+ $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/
+ $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/
+
+}code
3~ From 'snapshots'
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index a79f060..3283a0f 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -6,89 +6,121 @@ This chapter explains how to manage a live configuration from initial
creation, through successive revisions and successive releases of both the
live-build software and the live image itself.
-2~ Use auto to manage configuration changes
-
-Live configurations rarely are perfect on the first try. You'll likely need
-to make a series of revisions until you are satisfied. However,
-inconsistencies can creep into your configuration from one revision to the
-next if you aren't careful. The main problem is, once a variable is given a
-default value, that value will not be recomputed from other variables that
-may change in later revisions.
-
-For example, when the distribution is first set, many 'dependent' variables
-are given default values that suit that distribution. However, if you later
-decide to change the distribution, those dependent variables continue to
-retain old values that are no longer appropriate.
-
-A second, related problem is that if you run #{lb config}# and then upgrade
-to a new version of live-build that has changed one of the variable names,
-you will discover this only by manual review of the variables in your
-#{config/*}# files, which you will then need to use to set the appropriate
-option again.
-
-All of this would be a terrible nuisance if it weren't for auto/* scripts,
-simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
-that are designed to help you manage your configuration. Simply create an
-auto/config script containing #{lb config}# command with all desired
-options, and an auto/clean that removes the files containing configuration
-variable values, and each time you 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}#
+2~ Dealing with configuration changes
+
+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 use auto scripts? What do they do?
+
+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 --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 --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 7b2ef63..112a022 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,13 +9,13 @@
: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: 27.07.2012
+ :published: 2012-08-10
@publisher: Proiectul Debian Live <debian-live at lists.debian.org>
@make:
- :bold: /squeeze|wheezy|sid/
- :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
+ :bold: /squeeze|wheezy|jessie|sid/
+ :italics: /live-boot|live-build|live-config|live-debconfig|live-manual|live-tools|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
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/style_guide.ssi b/manual/ro/style_guide.ssi
index efc26c8..bcb4d81 100644
--- a/manual/ro/style_guide.ssi
+++ b/manual/ro/style_guide.ssi
@@ -327,20 +327,12 @@ that they use exactly the same markup as the original English version.
_* /{Code blocks}/
-Some translators decide to include the code blocks in the translated files
-because it is easier for them to identify what has already been translated
-and what has not by looking at the percentages if they use a graphical
-translation program.
-
-Include the code blocks if you want to score a 100% complete translation.
-
-On the other hand some translators prefer to leave the code blocks
-"untranslated" (i.e. not including them). This makes the translation easier
-to maintain once finished because it does not require translators
-intervention if the code changes.
-
-Leave the code blocks empty (they will be automatically added then) if you
-want to make your translation easier to maintain.
+Even though the code blocks are usually untranslatable, including them in
+the translation is the only way to score a 100% complete translation. And
+even though it means more work at first because it requires the intervention
+of the translators if the code changes, it is the best way, in the long run,
+to identify what has already been translated and what has not when checking
+the integrity of the .po files.
_* /{Newlines}/
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 eb3724f..53f2c76 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -10,9 +10,9 @@ are available to install in the image are the distribution and archive
areas. To ensure decent download speeds, you should choose a nearby
distribution mirror. You can also add your own repositories for backports,
experimental or custom packages, or include packages directly as files. You
-can define your own lists of packages to include, use live-build's
-predefined lists, use /{tasksel}/ tasks, or a combination of all
-three. Finally, a number of options give some control over /{apt}/, or if
+can define lists of packages, including metapackages which will install many
+related packages at once, such as packages for a particular desktop or
+language. Finally, a number of options give some control over /{apt}/, or if
you prefer, /{aptitude}/, at build time when packages are installed. You may
find these handy if you use a proxy, want to disable installation of
recommended packages to save space, or need to control which versions of
@@ -148,44 +148,76 @@ code{
There are a number of ways to choose which packages live-build will install
in your image, covering a variety of different needs. You can simply name
-individual packages to install in a package list. You can also choose
-predefined lists of packages, or use APT tasks. And finally, you may place
-package files in your #{config/}# tree, which is well suited to testing of
-new or experimental packages before they are available from a repository.
+individual packages to install in a package list. You can also use
+metapackages in those lists, or select them using package control file
+fields. And finally, you may place package files in your #{config/}# tree,
+which is well suited to testing of new or experimental packages before they
+are available from a repository.
3~package-lists Package lists
Package lists are a powerful way of expressing which packages should be
installed. The list syntax supports included files and conditional sections
which makes it easy to build lists from other lists and adapt them for use
-in multiple configurations. You can use predefined package lists, providing
-in a modular fashion package selections from each of the major desktop
-environments and some special purpose lists, as well as standard lists the
-others are based upon. You can also provide your own package lists, or use a
-combination of both.
+in multiple configurations. Package names may also be injected into the list
+using shell helpers at build time.
*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.
-3~ Predefined package lists
+3~using-metapackages Using metapackages
-The simplest way to use lists is to specify one or more predefined lists
-with the #{--package-lists}# option. For example:
+The simplest way to populate your package list is to use a task metapackage
+maintained by your distribution. For example:
code{
- $ lb config --package-lists "gnome rescue"
+ $ lb config
+ $ echo task-gnome-desktop > config/package-lists/gnome-desktop.list.chroot
+
+}code
+
+This supercedes the older predefined list method supported in #{live-build}#
+2.x. Unlike predefined lists, task metapackages are not specific to the
+Debian Live project. Instead, they are maintained by specialist working
+groups within the distribution and therefore reflect the consensus of each
+group about which packages best serve the needs of the intended users. They
+also cover a much broader range of use cases than the predefined lists they
+replace.
+
+All task metapackages are prefixed #{task-}#, so a quick way to determine
+which are available (though it may contain a handful of false hits that
+match the name but aren't metapackages) is to match on the package name
+with:
+
+code{
+
+ $ apt-cache search --names-only ^task-
}code
-The default location for the list files on your system is
-#{/usr/share/live/build/package-lists/}#. To determine the packages in a
-given list, read the corresponding file, paying attention to included files
-and conditionals as described in the following sections.
+In addition to these, you will find other metapackages with various
+purposes. Some are subsets of broader task packages, like #{gnome-core}#,
+while others are individual specialized parts of a Debian Pure Blend, such
+as the #{education-*}# metapackages. To list all metapackages in the
+archive, install the #{debtags}# package and list all packages with the
+#{role::metapackage}# tag as follows:
+
+code{
+
+ $ debtags search role::metapackage
+
+}code
3~ Local package lists
-You may supplement the predefined lists using local package lists stored in
-#{config/package-lists/}#.
+Whether you list metapackages, individual packages, or a combination of
+both, all local package lists are stored in #{config/package-lists/}#. Since
+more than one list can be used, this lends itself well to modular
+designs. For example, you may decide to devote one list to a particular
+choice of desktop, another to a collection of related packages that might as
+easily be used on top of a different desktop. This allows you to experiment
+with different combinations of sets of packages with a minimum of fuss,
+sharing common lists between different live image projects.
Package lists that exist in this directory need to have a #{.list}# suffix
in order to be processed, and then an additional stage suffix, #{.chroot}#
@@ -202,20 +234,25 @@ 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~ Extending a provided package list using includes
+3~generated-package-lists Generated package lists
-The package lists that are included with live-build make extensive use of
-includes. Refer to these in the #{/usr/share/live/build/package-lists/}#
-directory, as they serve as good examples of how to write your own 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
+command to be executed within the chroot when the image is built. For
+example, one might include the line #{! grep-aptavail -n -sPackage
+-FPriority standard | sort}# in a package list to produce a sorted list of
+available packages with #{Priority: standard}#.
-For example, to make a list that includes the predefined #{gnome}# list plus
-/{iceweasel}/, create #{config/package-lists/my.list.chroot}# with the
+In fact, selecting packages with the #{grep-aptavail}# command (from the
+#{dctrl-tools}# package) is so useful that #{live-build}# provides a
+#{Packages}# helper script as a convenience. This script takes two
+arguments: #{field}# and #{pattern}#. Thus, you can create a list with the
following contents:
code{
- #include <gnome>
- iceweasel
+ $ lb config
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
}code
@@ -275,28 +312,6 @@ code{
The nesting of conditionals is not supported.
-3~ Tasks
-
-The Debian Installer offers the user choices of a number of preselected
-lists of packages, each one focused on a particular kind of system, or task
-a system may be used for, such as "Graphical desktop environment", "Mail
-server" or "Laptop". These lists are called "tasks" and are supported by APT
-through the "Task:" field. You can specify one or more tasks in live-build
-by putting them in a list in #{config/task-lists/}#, as in the example
-below.
-
-code{
-
- $ lb config
- $ echo "mail-server file-server" >> config/task-lists/my.list.chroot
-
-}code
-
-The primary tasks available in the Debian Installer can be listed with
-#{tasksel --list-tasks}# in the live system. The contents of any task,
-including the ones not included in this list, may be examined with #{tasksel
---task-packages}#.
-
3~desktop-and-language-tasks Desktop and language tasks
Desktop and language tasks are special cases that need some extra planning
@@ -320,30 +335,16 @@ Because there is no provision made automatically for language tasks, which
include such things as language-specific fonts and input-method packages, if
you want them, you need to specify them in your configuration. For example,
a GNOME desktop image containing support for Japanese might include these
-tasks:
+task metapackages:
code{
$ lb config
- $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
- $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
+ $ echo "task-gnome-desktop task-laptop" >> config/package-lists/my.list.chroot
+ $ echo "task-japanese task-japanese-desktop task-japanese-gnome-desktop" >> config/package-lists/my.list.chroot
}code
-Since desktop tasks are "internal" tasks, for every desktop flavour task
-included in the image, the corresponding value, if it differs from the
-default, "gnome", must be preseeded in the "tasksel/desktop" debconf
-variable or else tasksel will not recognize and install it. Thus:
-
-code{
-
- $ lb config
- $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
-
-}code
-
-This parameter can take multiple values, e.g. "lxde xfce" instead of "kde".
-
2~installing-modified-or-third-party-packages Installing modified or
third-party packages
@@ -451,7 +452,7 @@ code{
}code
-3~ Tweaking APT to save space
+3~tweaking-apt-to-save-space Tweaking APT to save space
You may find yourself needing to save some space on the image media, in
which case one or the other or both of the following options may be of
@@ -473,7 +474,8 @@ before performing #{apt-cache search}# or #{apt-get install}#, for instance,
the user must #{apt-get update}# first to create those indices.
If you find the installation of recommended packages bloats your image too
-much, you may disable that default option of APT with:
+much, provided you are prepared to deal with the consequences discussed
+below, you may disable that default option of APT with:
code{
@@ -481,17 +483,27 @@ code{
}code
-The tradeoff here is that if you don't install recommended packages for a
-given package, that is, "packages that would be found together with this one
-in all but unusual installations" (Debian Policy Manual, section 7.2), some
-packages that you actually need may be omitted. Therefore, we suggest you
-review the difference turning off recommends makes to your packages list
-(see the #{binary.packages}# file generated by #{lb build}#) and re-include
-in your list any missing packages that you still want
-installed. Alternatively, if you find you only want a small number of
-recommended packages left out, leave recommends enabled and set a negative
-APT pin priority on selected packages to prevent them from being installed,
-as explained in {APT pinning}#apt-pinning.
+The most important consequence of turning off recommends is that
+#{live-boot}# and #{live-config}# themselves recommend some packages that
+provide important functionality used by most Live configurations, such as
+#{user-setup}# which #{live-config}# recommends and is used to create the
+live user. In all but the most exceptional circumstances you need to add
+back at least some of these recommends to your package lists or else your
+image will not work as expected, if at all. Look at the recommended packages
+for each of the #{live-*}# packages included in your build and if you are
+not certain you can omit them, add them back into your package lists.
+
+The more general consequence is that if you don't install recommended
+packages for any given package, that is, "packages that would be found
+together with this one in all but unusual installations" (Debian Policy
+Manual, section 7.2), some packages that users of your Live system actually
+need may be omitted. Therefore, we suggest you review the difference turning
+off recommends makes to your packages list (see the #{binary.packages}# file
+generated by #{lb build}#) and re-include in your list any missing packages
+that you still want installed. Alternatively, if you find you only want a
+small number of recommended packages left out, leave recommends enabled and
+set a negative APT pin priority on selected packages to prevent them from
+being installed, as explained in {APT pinning}#apt-pinning.
3~ Passing options to apt or aptitude
@@ -539,10 +551,11 @@ $ lb config --distribution wheezy
Negative pin priorities will prevent a package from being installed, as in
the case where you do not want a package that is recommended by another
-package. Suppose you are building an LXDE image using #{--package-lists
-lxde}# option, but don't want the user prompted to store wifi passwords in
-the keyring. This list includes /{gdm}/, which depends on /{gksu}/, which in
-turn recommends /{gnome-keyring}/. So you want to omit the recommended
+package. Suppose you are building an LXDE image using #{task-lxde-desktop}#
+in #{config/package-lists/lxde-desktop.list.chroot}#, but don't want the
+user prompted to store wifi passwords in the keyring. This metapackage
+depends on /{lxde-core}/, which recommends /{gksu}/, which in turn
+recommends /{gnome-keyring}/. So you want to omit the recommended
/{gnome-keyring}/ package. This can be done by adding the following stanza
to #{config/chroot_apt/preferences}#:
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index 47d89df..4bae885 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -76,7 +76,7 @@ encoding for each can be found in #{/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-variant}#, #{keyboard-options}# and
+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
@@ -117,7 +117,7 @@ layout (called Bepo) on a TypeMatrix EZ-Reach 2030 USB keyboard, use:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variants=bepo keyboard-model=tm2030usb"
}code
@@ -125,8 +125,8 @@ 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
+#{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:
@@ -134,7 +134,7 @@ Dvorak, use:
code{
$ lb config --bootappend-live \
- "keyboard-layouts=us,us keyboard-variant=,dvorak"
+ "keyboard-layouts=us,us keyboard-variants=,dvorak"
}code
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index e7bc9be..15ff20b 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,52 @@ 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 initial
+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}#:
+As explained in {Tweaking APT to save space}#tweaking-apt-to-save-space you
+may need to re-add some recommended packages to make your image work
+properly.
+
+An easy way to list recommends is using /{apt-cache}/. For example:
+
+code{
+
+ $ apt-cache depends live-config live-boot
+
+}code
+
+In this example we found out that we had to re-include several packages
+recommended by live-config and live-boot: #{user-setup}# to make autologin
+work and #{sudo}# as an essential program to shutdown the system. Besides,
+it could be handy to add #{live-tools}# to be able to copy the image to RAM
+and #{eject}# to eventually eject the live media, So:
+
+code{
+
+$ echo "live-tools user-setup sudo eject" >
+config/package-lists/recommends.list.chroot
+
+}code
+
+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 +314,31 @@ 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 --apt-indices false --apt-recommends false --memtest none
+ $ cp /usr/share/doc/live-build/examples/hooks/minimal.chroot config/hooks
+
+}code
+
+To make the image work properly, we must re-add, at least, two recommended
+packages which are left out by the #{--apt-recommends false}# option. See
+{Tweaking APT to save space}#tweaking-apt-to-save-space
code{
- $ lb config -k 486 -p minimal --apt-indices false \
- --memtest none --apt-recommends false --includes none
+ $ echo "user-setup sudo" > config/package-lists/recommends.list.chroot
}code
@@ -314,23 +350,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.chroot}# 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
@@ -373,10 +413,11 @@ code{
}code
At boot time we will generate the pt_BR.UTF-8 locale and select the
-pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
-"kde" so that tasksel will install the correct desktop task, as it differs
-from the default (see {Desktop and languages
-tasks}#desktop-and-language-tasks). Now let's put the pieces together:
+pt-latin1 keyboard layout. Now let's put the pieces together. Recalling from
+{Using metapackages}#using-metapackages that task metapackages are prefixed
+#{task-}#, we just specify these language boot parameters, then add standard
+priority packages and all our discovered task metapackages to our package
+list as follows:
code{
@@ -387,10 +428,10 @@ code{
-k 486 \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
- brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
- $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
- $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \
+ task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot
}code
diff --git a/manual/ro/user_installation.ssi b/manual/ro/user_installation.ssi
index 2a28091..e0267f4 100644
--- a/manual/ro/user_installation.ssi
+++ b/manual/ro/user_installation.ssi
@@ -10,11 +10,11 @@ _* Super user (root) access
_* An up-to-date version of live-build
-_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/.
+_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/
_* /{debootstrap}/ or /{cdebootstrap}/
-_* Linux 2.6.x
+_* Linux 2.6.x or 3.x
Note that using Debian or a Debian-derived distribution is not required -
live-build will run on almost any distribution with the above requirements.
@@ -151,14 +151,28 @@ code{
}code
-_* Use all generated .deb files
+_* Use applicable generated .deb files
As live-boot and live-config are installed by live-build system, installing
the packages in the host system is not sufficient: you should treat the
-generated .deb files like any other custom packages. Please see {Customizing
-package installation}#customizing-package-installation for more
-information. You should pay particular attention to {Additional
-repositories}#additional-repositories.
+generated .deb files like any other custom packages. Since your purpose for
+building from source is like to test new things over the short term before
+the official release, follow {Installing modified or third-party
+packages}#installing-modified-or-third-party-packages to temporarily include
+the relevant files in your configuration. In particular, notice that both
+packages are divided into a generic part, a documentation part and one or
+more back-ends. Include the generic part, only one back-end matching your
+configuration, and optionally the documentation. Assuming you are building a
+live image in the current directory and have generated all .deb files for a
+single version of both packages in the directory above, these bash commands
+would copy all of the relevant packages including default back-ends:
+
+code{
+
+ $ cp ../live-boot{_,-initramfs-tools,-doc}*.deb config/packages.chroot/
+ $ cp ../live-config{_,-sysvinit,-doc}*.deb config/packages.chroot/
+
+}code
3~ From 'snapshots'
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index a79f060..3283a0f 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -6,89 +6,121 @@ This chapter explains how to manage a live configuration from initial
creation, through successive revisions and successive releases of both the
live-build software and the live image itself.
-2~ Use auto to manage configuration changes
-
-Live configurations rarely are perfect on the first try. You'll likely need
-to make a series of revisions until you are satisfied. However,
-inconsistencies can creep into your configuration from one revision to the
-next if you aren't careful. The main problem is, once a variable is given a
-default value, that value will not be recomputed from other variables that
-may change in later revisions.
-
-For example, when the distribution is first set, many 'dependent' variables
-are given default values that suit that distribution. However, if you later
-decide to change the distribution, those dependent variables continue to
-retain old values that are no longer appropriate.
-
-A second, related problem is that if you run #{lb config}# and then upgrade
-to a new version of live-build that has changed one of the variable names,
-you will discover this only by manual review of the variables in your
-#{config/*}# files, which you will then need to use to set the appropriate
-option again.
-
-All of this would be a terrible nuisance if it weren't for auto/* scripts,
-simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
-that are designed to help you manage your configuration. Simply create an
-auto/config script containing #{lb config}# command with all desired
-options, and an auto/clean that removes the files containing configuration
-variable values, and each time you 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}#
+2~ Dealing with configuration changes
+
+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 use auto scripts? What do they do?
+
+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 --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 --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