[SCM] live-manual branch, upstream, updated. upstream/3.0_a13-1-gbd52aca
Daniel Baumann
daniel at debian.org
Fri Jul 27 16:58:13 UTC 2012
The following commit has been merged in the upstream branch:
commit bd52acaf0f0028b8fff15fe75a2ab734160e312f
Author: Daniel Baumann <daniel at debian.org>
Date: Fri Jul 27 18:58:50 2012 +0200
Adding upstream version 3.0~a14.
diff --git a/Makefile b/Makefile
index 9a313e5..49fbdbc 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,9 @@ all: build
test:
@echo "Checking for syntax errors... [not implemented yet - FIXME]"
@echo "Checking for spelling errors... [not implemented yet - FIXME]"
-
+ @echo ""
+ @echo "You can check the integrity of po files using 'make check'."
+ @echo ""
tidy:
# Removing useless whitespaces at EOL
for FILE in manual/en/*.ssm manual/en/*.ssi; \
@@ -103,6 +105,7 @@ uninstall:
clean:
rm -rf build
rm -f manual/en/*~
+ rm -f manual/po/*/*.mo
distclean: clean
rm -rf build
@@ -116,3 +119,6 @@ translate:
else \
echo "There are no fuzzy strings to translate." ; \
fi
+
+check:
+ @./manual/bin/po-integrity-check.sh
diff --git a/VERSION b/VERSION
index 8d27758..2791e1e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a13-1
+3.0~a14-1
diff --git a/manual/Makefile b/manual/Makefile
index 7992825..d949d11 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -50,4 +50,6 @@ distclean: clean
rm -f po4a.cfg
rm -rf $(LANGUAGES)
-rebuild: distclean update build
+rebuild: distclean update build unfuzzy
+unfuzzy:
+ @./bin/unfuzzy-dates.sh
diff --git a/manual/bin/po-integrity-check.sh b/manual/bin/po-integrity-check.sh
new file mode 100755
index 0000000..d36bc35
--- /dev/null
+++ b/manual/bin/po-integrity-check.sh
@@ -0,0 +1,73 @@
+#!/bin/sh
+
+set -e
+
+# Script to help translators to check the integrity of po files in live-manual.
+#
+# 'msgfmt' performs several checks and outputs some common errors:
+#
+# - Checks format
+# - Checks header
+# - ...
+#
+# We do not want to compile a .mo file so we use /dev/null.
+#
+
+echo ""
+echo "This script can help you check the integrity of po files."
+echo "Select: $(ls -C manual/po) ['a' to see all] ['q' to quit] "
+
+# Creating function
+
+Integrity_check()
+{
+ echo "Checking the integrity of $(ls manual/po/${LANGUAGE}/* | wc -l) po files in ${LANGUAGE}."
+ echo ""
+ for POFILE in manual/po/${LANGUAGE}/*
+ do
+ echo "-$(basename ${POFILE})"
+ echo ""
+ 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
+ echo "-> This .po file is 'GOOD'."
+ echo ""
+ fi
+ done
+}
+
+# Menu.
+
+read LANGUAGE
+
+case "$LANGUAGE" in
+ en) echo "Nothing to be done, really!"
+ ;;
+
+ ca|de|es|fr|it|pt_BR|ro)
+ Integrity_check
+ ;;
+
+ a) for LANGUAGE in manual/po/*
+ do
+ for POFILE in ${LANGUAGE}/*
+ do
+ echo "-Checking $(basename ${POFILE}) integrity in ${LANGUAGE}"
+ echo ""
+ 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
+ echo "->This .po file is 'GOOD'."
+ echo ""
+ fi
+ done
+ done
+ ;;
+
+ q) exit 0
+ ;;
+
+ *) echo "No language chosen. Exiting..."
+ ;;
+
+esac
diff --git a/manual/bin/unfuzzy-dates.sh b/manual/bin/unfuzzy-dates.sh
new file mode 100755
index 0000000..6f9da3d
--- /dev/null
+++ b/manual/bin/unfuzzy-dates.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+# Script to automatically fix "predictable" fuzzy strings in live-manual.
+# 'XY' is the start line number of the fuzzy strings in the dates.
+
+XY="50"
+
+# Getting the unfuzzying done.
+
+echo "Fixing 'fuzzy' in date strings..."
+
+for LANGUAGE in $(ls po)
+do
+ if [ "$(grep --line-number --word-regexp 'fuzzy' po/${LANGUAGE}/live-manual.ssm.po | sed 's/[^0-9]*//g')" -eq "${XY}" ] > /dev/null 2>&1
+ then
+ sed -i -e "${XY} s|#, fuzzy, no-wrap|#, no-wrap|" \
+ -e "$((${XY} + 1)),$((${XY} + 3))d" \
+ po/${LANGUAGE}/live-manual.ssm.po
+ fi
+done
diff --git a/manual/bin/update-version.sh b/manual/bin/update-version.sh
index d2ca23a..c77612d 100755
--- a/manual/bin/update-version.sh
+++ b/manual/bin/update-version.sh
@@ -14,7 +14,7 @@ sed -i -e "s|^ :published:.*$| :published: ${YEAR}-${MONTH}-${DAY}|" \
en/live-manual.ssm
# European date format
-for _LANGUAGE in de es fr it ro
+for _LANGUAGE in ca de es fr it ro
do
if [ -e po/${_LANGUAGE}/live-manual.ssm.po ]
then
diff --git a/manual/ca/live-manual.ssm b/manual/ca/live-manual.ssm
index 0b0b93d..7b8faff 100644
--- a/manual/ca/live-manual.ssm
+++ b/manual/ca/live-manual.ssm
@@ -9,7 +9,7 @@
: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-06-27
+ :published: 2012-07-27
@publisher: Projecte Debian Live <debian-live at lists.debian.org>
@@ -18,6 +18,7 @@
:italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/
:num_top: 1
:skin: skin_debian-live
+
:A~ @title
:B~ Sobre aquest manual
diff --git a/manual/ca/project_bugs.ssi b/manual/ca/project_bugs.ssi
index 72e7ec0..c4e404f 100644
--- a/manual/ca/project_bugs.ssi
+++ b/manual/ca/project_bugs.ssi
@@ -13,11 +13,12 @@ _* Always check first the image status updates on our homepage at
http://live.debian.net/ for known issues.
_* Always try to reproduce the bug with the *{most recent versions}* of
-live-build, live-boot, and live-config before submitting a bug report.
+live-build, live-boot, live-config and live-tools before submitting a bug
+report.
_* Try to give *{as specific information as possible}* about the bug. This
-includes (at least) the version of live-build, live-boot, and live-config
-used and the distribution of the live system you are building.
+includes (at least) the version of live-build, live-boot, live-config, and
+live-tools used and the distribution of the live system you are building.
2~ Known issues
@@ -71,6 +72,8 @@ _* Version of live-boot on the live system
_* Version of live-config on the live system
+_* Version of live-tools on the live system
+
_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
_* Architecture of the live system
@@ -89,8 +92,7 @@ code{
}code
-At boot time, live-boot stores a log in #{/var/log/live.log}# (or
-#{/var/log/live-boot.log}#).
+At boot time, live-boot stores a log in #{/var/log/live-boot.log}#.
Additionally, to rule out other errors, it is always a good idea to tar up
your #{config/}# directory and upload it somewhere (do *{not}* send it as an
@@ -118,7 +120,12 @@ increments.
2~ Use the correct package to report the bug against
-Where does the bug appear?
+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.
+
+However, we would appreciate if you try to narrow it down according to where
+the bug appears.
3~ At build time whilst bootstrapping
@@ -177,8 +184,8 @@ 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, and live-config to see whether something similar has been
-reported already.
+live-boot, live-config and live-tools to see whether something similar has
+been reported already.
2~ Where to report bugs
@@ -190,8 +197,9 @@ http://bugs.debian.org/. You can also submit the bugs by using the
In general, you should report build time errors against the live-build
package, boot time errors against live-boot, and run time errors against
live-config. If you are unsure of which package is appropriate or need more
-help before submitting a bug report, please send a message to the mailing
-list and we will help you to figure it out.
+help before submitting a bug report, please report it against the
+debian-live pseudo-package. We will then take care about it and reassign it
+where appropriate.
Please note that bugs found in distributions derived from Debian (such as
Ubuntu and others) should *{not}* be reported to the Debian BTS unless they
diff --git a/manual/ca/user_basics.ssi b/manual/ca/user_basics.ssi
index 22f077a..c7d1ed0 100644
--- a/manual/ca/user_basics.ssi
+++ b/manual/ca/user_basics.ssi
@@ -376,10 +376,10 @@ continuació. Per regla general, el següent pas és aconseguir un carregador
d'arrencada de més alt nivell a través del protocol TFTP. Podria ser GRUB,
pxelinux o fins i tot arrencar directament a un sistema operatiu com Linux.
-Per exemple, si es descomprimeix el arxiu #{binary-net.tar.gz}# generat al
-directori #{/srv/debian-live}#, es trobarà la imatge del sistema de fitxers
-a #{live/filesystem.squashfs}# i el nucli, initrd i carregador d'arrencada
-pxelinux a #{tftpboot/debian-live/i386}#.
+Per exemple, si es descomprimeix el arxiu #{binary.netboot.tar.xz}# generat
+al directori #{/srv/debian-live}#, es trobarà la imatge del sistema de
+fitxers a #{live/filesystem.squashfs}# i el nucli, initrd i carregador
+d'arrencada pxelinux a #{tftpboot/debian-live/i386}#.
Ara hem de configurar els tres serveis al servidor per l'arrencada en xarxa:
el servidor DHCP, servidor TFTP i el servidor NFS.
diff --git a/manual/ca/user_customization-contents.ssi b/manual/ca/user_customization-contents.ssi
index e6237cf..c6f1572 100644
--- a/manual/ca/user_customization-contents.ssi
+++ b/manual/ca/user_customization-contents.ssi
@@ -1,51 +1,54 @@
-:B~ Customizing contents
+:B~ Personalització dels continguts
-1~customizing-contents Customizing contents
+1~customizing-contents Personalització dels continguts
-This chapter discusses fine-tuning customization of the live system contents
-beyond merely choosing which packages to include. Includes allow you to add
-or replace arbitrary files in your Debian Live image, hooks allow you to
-execute arbitrary commands at different stages of the build and at boot
-time, and preseeding allows you to configure packages when they are
-installed by supplying answers to debconf questions.
+Aquest capítol tracta d'afinar la personalització dels continguts del
+sistema en viu més enllà de simplement triar els paquets que es desitja
+incloure. Els «includes» permeten afegir o reemplaçar fitxers arbitraris en
+la imatge Debian Live, els scripts ganxo (hooks) permeten executar ordres
+arbitràries en diferents etapes de la construcció i en el moment d'arrencar,
+i la preconfiguració permet configurar paquets quan s'instaŀlen mitjançant
+respostes a les preguntes de debconf .
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:
+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:
-_* 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.
+_* Chroot local includes: Aquests permeten afegir o substituir fitxers
+dintre de chroot/Live en el sistema de fitxers. Consultar {Live/chroot local
+includes}#live-chroot-local-includes per a més informació.
-_* 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 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: 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.
+_* 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ó.
-Please see {Terms}#terms for more information about the distinction between
-the "Live" and "binary" images.
+Consultar {Termes}#terms per a més informació sobre la distinció entre les
+imatges "Live" and "binary".
3~live-chroot-local-includes Live/chroot local includes
-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
-populate the skeleton user directory (#{/etc/skel}#) used by the Live system
-to create the live user's home directory. Another is to supply configuration
-files that can be simply added or replaced in the image without processing;
-see {Live/chroot local hooks}#live-chroot-local-hooks if processing is
-needed.
+Es poden utilitzar els chroot local includes per afegir o reemplaçar fitxers
+en el sistema de fitxers chroot/Live perquè puguin ser utilitzats en el
+sistema en viu. Un ús típic és per omplir l'esquelet de directori d'usuari
+(#{/etc/skel}#)utilitzat pel sistema en viu per crear el directori home de
+l'usuari en viu. Un altre és el de subministrar fitxers de configuració que
+poden ser simplement afegits o reemplaçats en la imatge sense processar;
+veure{Live/chroot local hooks}#live-chroot-local-hooks si es necessita
+processar-los.
-To include files, simply add them to your #{config/includes.chroot}#
-directory. This directory corresponds to the root directory #{/}# of the
-live system. For example, to add a file #{/var/www/index.html}# in the live
-system, use:
+Per incloure fitxers, només s'han d'afegir al directori
+#{config/includes.chroot}#. Aquest directori es correspon amb el directori
+arrel #{/}# del sistema en viu. Per exemple, per afegir un fitxer
+#{/var/www/index.html}# en el sistema en viu, fer:
code{
@@ -54,7 +57,7 @@ code{
}code
-Your configuration will then have the following layout:
+La configuració tindrà llavors l'estructura següent:
code{
@@ -69,18 +72,19 @@ code{
}code
-Chroot local includes are installed after package installation so that files
-installed by packages are overwritten.
+Els chroot local includes s'instaŀlen després de la instaŀlació del paquets
+de tal manera que es sobreescriuen els fitxers instaŀlats pels paquets.
3~binary-local-includes Binary local includes
-To include material such as documentation or videos on the media filesystem
-so that it is accessible immediately upon insertion of the media without
-booting the Live system, you can use binary local includes. This works in a
-similar fashion to chroot local includes. For example, suppose the files
-#{~/video_demo.*}# are demo videos of the live system described by and
-linked to by an HTML index page. Simply copy the material to
-#{config/includes.binary/}# as follows:
+Per incloure material com documentació o vídeos en el sistema de fitxers
+dels medis de manera que sigui accessible immediatament després de la
+inserció dels medis sense haver de arrencar el sistema en viu, es pot
+utilitzar els binary local includes. Això funciona de manera similar als
+chroot local includes. Per exemple, si els fitxers #{~/video_demo.*}# són
+vídeos de demostració del sistema en viu descrits i lligats per una pàgina
+d'índex HTML. Només cal copiar el material a #{config/includes.binary/}# de
+la següent manera:
code{
@@ -88,12 +92,13 @@ code{
}code
-These files will now appear in the root directory of the live media.
+Aquests fitxers apareixeran ara en el directori arrel dels medis en viu.
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:
+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{
@@ -101,55 +106,57 @@ code{
}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}#.
+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 Hooks
+2~hooks Scripts ganxo (Hooks)
-Hooks allow commands to be performed in the chroot and binary stages of the
-build in order to customize the image.
+Els scripts ganxo permeten executar ordres en les etapes de la construcció
+chroot i binary per tal de personalitzar la imatge.
3~live-chroot-local-hooks Live/chroot local hooks
-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
-will run in the chroot after the rest of your chroot configuration has been
-applied, so remember to ensure your configuration includes all packages and
-files your hook needs in order to run. See the example chroot hook scripts
-for various common chroot customization tasks provided in
-#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
-use them in your own configuration.
-
-3~boot-time-hooks Boot-time hooks
-
-To execute commands at boot time, you can supply live-config hooks as
-explained in the "Customization" section of its man page. Examine
-live-config's own hooks provided in #{/lib/live/config/}#, noting the
-sequence numbers. Then provide your own hook prefixed with an appropriate
-sequence number, either as a chroot local include in
-#{config/includes.chroot/lib/live/config/}#, or as a custom package as
-discussed in {Installing modified or third-party
-packages}#installing-modified-or-third-party-packages.
+Per executar ordres en l'etapa chroot, crear un script ganxo al directori
+#{config/hooks/}# amb el sufix #{.chroot}# que contingui les ordres. El
+ganxo s'executarà en el chroot després que la resta de la configuració del
+chroot s'hagi aplicat, assegurar-se que la configuració inclou tots els
+paquets i els fitxers que el ganxo necessita per funcionar. Veure els
+scripts chroot d'exemple per a diverses tasques comunes de personalització
+que es poden trovar a #{/usr/share/live/build/examples/hooks}# que es poden
+copiar o fer un enllaç simbòlic per utilitzar-los en la configuració pròpia.
+
+3~boot-time-hooks Scripts ganxo durant l'arrencada
+
+Per executar ordres durant l'arrencada, es pot proporcionar scripts ganxo
+live-config com s'explica a la secció "Personalització" de la seva pàgina de
+manual. Es poden proporcionar els ganxos de live-config a
+#{/lib/live/config/}#, tenint en compte la seqüència dels números. A
+continuació, proporcionar el script ganxo propi amb el prefix d'un número de
+seqüència apropiat, ja sigui com a un chroot local include a
+#{config/includes.chroot/lib/live/config/}#, o com un paquet personalitzat
+com es va discutir a {Instaŀlació de paquets modificats o de
+tercers}#installing-modified-or-third-party-packages.
3~ Binary local hooks
-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
-will run after all other binary commands are run, but before
-binary_checksums, the very last binary command. The commands in your hook do
-not run in the chroot, so take care to not modify any files outside of the
-build tree, or you may damage your build system! See the example binary hook
-scripts for various common binary customization tasks provided in
-#{/usr/share/live/build/examples/hooks}# which you can copy or symlink to
-use them in your own configuration.
-
-2~ Preseeding Debconf questions
-
-Files in the #{config/preseed/}# directory suffixed with #{.preseed}#
-followed by the stage (#{.chroot}# or #{.binary}#) are considered to be
-debconf preseed files and are installed by live-build using
-#{debconf-set-selections}# during the corresponding stage.
-
-For more information about debconf, please see #{debconf(7)}# in the
-/{debconf}/ package.
+Per executar ordres a l'etapa binary, crear un script ganxo amb un sufix
+#{.binary}# que contingui les ordres al directori #{config/hooks/}#. El
+ganxo s'executarà després que s'executin totes les ordres de la etapa binary
+però avans dels binary_checksums, la darrera ordre de la etapa binary. Les
+ordres del ganxo no s'executen al chroot, per tant tenir cura de no
+modificar cap fitxer de fora del arbre de construcció, o es pot fer malbé el
+sistema de creació! Veure els scripts ganxo de binary per a diverses tasques
+comunes de personalització a #{/usr/share/live/build/examples/hooks}# que es
+poden copiar o fer un enllaç simbòlic per utilitzar-los en la configuració
+pròpia.
+
+2~ Preconfiguració de les preguntes de Debconf
+
+Els fitxers del directory #{config/preseed/}# amb el sufix #{.preseed}#
+seguits del sufix de la etapa (#{.chroot}# o #{.binary}#) son considerats
+fitxers de preconfiguració de debconf i són instaŀlats per live-build
+utilitzant #{debconf-set-selections}# durant l'etapa corresponent.
+
+Per a més informació sobre debconf, veure #{debconf(7)}# del paquet
+/{debconf}/.
diff --git a/manual/ca/user_customization-overview.ssi b/manual/ca/user_customization-overview.ssi
index 0e2fec2..3357649 100644
--- a/manual/ca/user_customization-overview.ssi
+++ b/manual/ca/user_customization-overview.ssi
@@ -1,76 +1,82 @@
-:B~ Customizing contents
+:B~ Personalització dels continguts
-1~customization-overview Customization overview
+1~customization-overview Personalització dels continguts
-This chapter gives an overview of the various ways in which you may
-customize a Debian Live system.
+En aquest capítol s'ofereix una visió general de les diverses formes en què
+es pot personalitzar un sistema Debian Live.
-2~ Build time vs. boot time configuration
+2~ Configuració durant la construcció vs. durant l'arrencada
-Live system configuration options are divided into build-time options which
-are options that are applied at build time and boot-time options which are
-applied at boot time. Boot-time options are further divided into those
-occurring early in the boot, applied by the live-boot package, and those
-that happen later in the boot, applied by live-config. Any boot-time option
-may be modified by the user by specifying it at the boot prompt. The image
-may also be built with default boot parameters so users can normally just
-boot directly to the live system without specifying any options when all of
-the defaults are suitable. In particular, the argument to #{lb
---bootappend-live}# consists of any default kernel command line options for
-the Live system, such as persistence, keyboard layouts, or timezone. See
-{Customizing locale and language}#customizing-locale-and-language, for
-example.
+La configuració de un sistema en viu es divideix en opcions en temps de
+constucció que són les opcions que s'apliquen durant la seva creació i les
+opcions d'arrencada del sistema que s'apliquen durant l'arrencada. Les
+opcions d'arrencada es divideixen en les què ocorren al principi de
+l'arrencada, aplicades pel paquet live-boot, i les que ocorren més tard en
+l'arrencada, aplicades per live-config. Qualsevol opció durant l'arrencada
+pot ser modificada per l'usuari, especificant-la a l'indicador
+d'arrencada. La imatge també pot ser construïda amb els paràmetres
+d'arrencada per defecte perquè els usuaris puguin simplement arrencar el
+sistema en viu sense especificar cap altra opció, ja que tots els valors per
+defecte són adequats. En particular, l'argument #{lb --bootappend-live}#
+consta de les opcions de línia d'ordres per defecte del nucli per al sistema
+en viu, com ara la persistència, la distribució del teclat o la zona
+horària. Veure {Personalització de l'entorn local i el
+llenguatge}#customizing-locale-and-language, per exemple.
-Build-time configuration options are described in the #{lb config}# man
-page. Boot-time options are described in the man pages for live-boot and
-live-config. Although the live-boot and live-config packages are installed
-within the live system you are building, it is recommended that you also
-install them on your build system for easy reference when you are working on
-your configuration. It is safe to do so, as none of the scripts contained
-within them are executed unless the system is configured as a live system.
+Les opcions de configuració durant la construcció es descriuen a la pàgina
+del manual de #{lb config}#. Les opcions durant l'arrencada es descriuen a
+les pàgines del manual de live-boot i live-config. Malgrat que els paquets
+live-boot i live-config s'instaŀlen en el sistema en viu que s'està
+construint, és recomana instaŀlar-los en el sistema de construcció per a una
+referència fàcil quan s'està treballant en la configuració. És segur fer-ho,
+ja que cap dels scripts continguts en ells s'executen a menys que el sistema
+s'hagi configurat com a sistema viu.
-2~stages-of-the-build Stages of the build
+2~stages-of-the-build Etapes de la construcció
-The build process is divided into stages, with various customizations
-applied in sequence in each. The first stage to run is the *{bootstrap}*
-stage. This is the initial phase of populating the chroot directory with
-packages to make a barebones Debian system. This is followed by the
-*{chroot}* stage, which completes the construction of chroot directory,
-populating it with all of the packages listed in the configuration, along
-with any other materials. Most customization of content occurs in this
-stage. The final stage of preparing the live image is the *{binary}* stage,
-which builds a bootable image, using the contents of the chroot directory to
-construct the root filesystem for the Live system, and including the
-installer and any other additional material on the target media outside of
-the Live system's filesystem. After the live image is built, if enabled, the
-source tarball is built in the *{source}* stage.
+El procés de construcció es divideix en etapes, amb personalitzacions
+diferentes aplicades successivament en cada una. La primera etapa que
+s'executa es la fase *{bootstrap}*. Aquesta és la fase inicial de poblar el
+directori chroot amb paquets per fer un sistema Debian bàsic. Això és seguit
+per l'etapa *{chroot}*, que completa la construcció de directori chroot,
+omplint-lo amb tots els paquets que s'indiquen en la configuració, juntament
+amb qualsevol altre material. La majoria de personalitzacions dels
+continguts es produeix en aquesta etapa. L'etapa final de preparació de la
+imatge en viu és l'etapa *{binary}*, quan es construeix una imatge capaç
+d'arrencar, amb el contingut del directori chroot per construir el sistema
+de fitxers arrel per al sistema en viu, i que inclou el programa de
+instaŀlació i qualsevol altre material addicional en el medi de destinació
+fora del sistema de fitxers del sistema en viu. Després de construir la
+imatge en viu, si està habilitat, el codi font original s'inclou a l'etapa
+*{source}*.
-Within each of these stages, there is a particular sequence in which
-commands are applied. These are arranged in such a way as to ensure
-customizations can be layered in a reasonable fashion. For example, within
-the *{chroot}* stage, preseeds are applied before any packages are
-installed, packages are installed before any locally included files or
-patches are applied, and hooks are run later, after all of the materials are
-in place.
+Dins de cadascuna d'aquestes etapes, hi ha una seqüència particular en la
+qual s'apliquen les ordres. Aquestes estan disposades de manera que es
+garanteixi que les personalitzacions es poden superposar de manera
+raonable. Per exemple, dins l'etapa chroot, les preconfiguracions (preseeds)
+s'apliquen abans que s'instaŀlin els paquets, els paquets s'instaŀlen abans
+que s'apliquin els fitxers locals o pegats inclosos, i els ganxos s'executen
+més tard, després que tots els materials estiguin al seu lloc.
-2~ Supplement lb config with files
+2~ Suplementar lb config amb fitxers
-Although #{lb config}# creates a skeletal configuration in the config/
-directory, to accomplish your goals, you may need to provide additional
-files in subdirectories of config/. Depending on where the files are stored
-in the configuration, they may be copied into the live system's filesystem
-or into the binary image filesystem, or may provide build-time
-configurations of the system that would be cumbersome to pass as
-command-line options. You may include things such as custom lists of
-packages, custom artwork, or hook scripts to run either at build time or at
-boot time, boosting the already considerable flexibility of debian-live with
-code of your own.
+Encara que #{lb config}# crea una configuració en esquelet al directori
+config/, per aconseguir els objectius, pot ser necessari proporcionar
+fitxers addicionals en els subdirectoris de config/. Depenent d'on
+s'emmagatzemen els fitxers en la configuració, poden ser copiats en el
+sistema d'fitxers del sistema en viu o en el sistema de fitxers de la imatge
+binària, o es pot proporcionar configuracions en temps de creació del
+sistema que serien engorroses de passar com opcions de línia d'ordres. Es
+pot incloure coses com ara llistes personalitzades de paquets, art
+personalitzat o scripts ganxo per funcionar ja sigui en temps de construcció
+o en temps d'arrencada, augmentant la flexibilitat ja considerable de
+debian-live amb codi propi.
-2~ Customization tasks
+2~ Tasques de personalització
-The following chapters are organized by the kinds of customization task
-users typically perform: {Customizing package
-installation}#customizing-package-installation, {Customizing
-contents}#customizing-contents and {Customizing locale and
-language}#customizing-locale-and-language cover just a few of the things you
-might want to do.
+Els següents capítols s'organitzen pel tipus de tasques de personalització
+que els usuaris solen realitzar: {Personalització de la instaŀlació de
+paquets}#customizing-package-installation, {Personalització dels
+continguts}#customizing-contents i {Personalització de l'entorn local i el
+llenguatge}#customizing-locale-and-language cobreixen només algunes de les
+coses que es poden fer.
diff --git a/manual/ca/user_customization-packages.ssi b/manual/ca/user_customization-packages.ssi
index eb3724f..61157af 100644
--- a/manual/ca/user_customization-packages.ssi
+++ b/manual/ca/user_customization-packages.ssi
@@ -1,36 +1,39 @@
-:B~ Customizing package installation
-
-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 versions of
-packages are installed via APT pinning, to name a few possibilities.
-
-2~ Package sources
-
-3~ Distribution, archive areas and mode
-
-The distribution you choose has the broadest impact on which packages are
-available to include in your live image. Specify the codename, which
-defaults to wheezy for the wheezy version of live-build. Any current
-distribution carried in the Debian archive may be specified by its codename
-here. (See {Terms}#terms for more details.) The #{--distribution}# option
-not only influences the source of packages within the archive, but also
-instructs live-build to behave as needed to build each supported
-distribution. For example, to build against the *{unstable}* release, sid,
-specify:
+:B~ Personalització de la instaŀlació de paquets
+
+1~customizing-package-installation Personalització de la instaŀlació de
+paquets
+
+La personalització més bàsica d'un sistema Debian viu pot ser la selecció
+dels paquets que seran inclosos en la imatge. Aquest capítol explica les
+diverses opcions de live-build per personalitzar la instaŀlació de paquets
+durant la construcció. Les opcions més importants que influeixen en els
+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.
+
+2~ Fonts dels paquets
+
+3~ Distribució, zones d'arxiu i mode
+
+La distribució que es tria té una gran importància en els paquets que estan
+disponibles per incloure en una imatge en viu. Només cal especificar el nom
+en clau, que per defecte és wheezy per a la versió wheezy de
+live-build. Qualsevol distribució disponible a l'arxiu de Debian pot ser
+especificada pel seu nom en clau aquí. (Veure {Termes}#terms per més
+detalls.) L'opció #{--distribution}# no només influeix en l'origen dels
+paquets dins l'arxiu, sinó que també instrueix a live-build per comportar-se
+segons sigui necessari per a construir cada distribució compatible. Per
+exemple, per construir la distribució *{unstable}*, sid, s'ha d'especificar:
code{
@@ -38,10 +41,11 @@ code{
}code
-Within the distribution archive, archive areas are major divisions of the
-archive. In Debian, these are #{main}#, #{contrib}# and #{non-free}#. Only
-#{main}# contains software that is part of the Debian distribution, hence
-that is the default. One or more values may be specified, e.g.
+A l'arxiu de la distribució, les àrees d'arxiu són les divisions principals
+de l'arxiu. A Debian, es tracta de #{main}#, #{contrib}# i #{non-free}#.
+Només #{main}# conté el programari que és part de la distribució Debian, pel
+que és el valor per defecte. Un o més valors es poden especificar, per
+exemple:
code{
@@ -49,34 +53,38 @@ code{
}code
-Experimental support is available for some Debian derivatives through a
-#{--mode}# option. By default, this option is set to #{debian}#, even if you
-are building on a non-Debian system. If you specify #{--mode ubuntu}# or
-#{--mode emdebian}#, the distribution names and archive areas for the
-specified derivative are supported instead of the ones for Debian. The mode
-also modifies live-build behaviour to suit the derivatives.
-
-*{Note:}* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.
-
-3~ Distribution mirrors
-
-The Debian archive is replicated across a large network of mirrors around
-the world so that people in each region can choose a nearby mirror for best
-download speed. Each of the #{--mirror-*}# options governs which
-distribution mirror is used at various stages of the build. Recall from
-{Stages of the build}#stages-of-the-build that the *{bootstrap}* stage is
-when the chroot is initially populated by /{debootstrap}/ with a minimal
-system, and the *{chroot}* stage is when the chroot used to construct the
-live system's filesystem is built. Thus, the corresponding mirror switches
-are used for those stages, and later, in the *{binary}* stage, the
-#{--mirror-binary}# and #{--mirror-binary-security}# values are used,
-superceding any mirrors used in an earlier stage.
-
-3~distribution-mirrors-build-time Distribution mirrors used at build time
-
-To set the distribution mirrors used at build time to point at a local
-mirror, it is sufficient to set #{--mirror-bootstrap}#,
-#{--mirror-chroot-security}# and #{--mirror-chroot-backports}# as follows.
+És dona suport experimental a alguns derivats de Debian a través de l'opció
+#{--mode}#. Per defecte, aquesta opció està establerta en #{debian}#, tot i
+que se estigui construint en un sistema que no sigui Debian. Si s'especifica
+#{--mode ubuntu}# o #{--mode emdebian}#, s'utilitzen els noms de distribució
+i les àrees dels arxius dels derivats especificats en lloc dels de
+Debian. El «mode» també modifica el comportament de live-build per
+adaptar-lo als derivats.
+
+*{Nota:}* Els projectes per als quals aquests modes s'han afegit són els principals responsables de donar suport als usuaris d'aquestes opcions. El projecte Debian Live, al seu torn, dona suport de desenvolupament només sobre una base de millor esforç, basada en les informacions proporcionades pels projectes derivats ja que nosaltres no desenvolupem ni donem suport a aquests derivats.
+
+3~ Miralls de distribució
+
+L'arxiu de Debian es replica a través d'una àmplia xarxa de miralls a tot el
+món perquè la gent en cada regió pugui triar un mirall proper amb la millor
+velocitat de descàrrega. Cadascuna de les opcions #{--mirror-*}# governa
+quin mirall de distribució s'utilitzara en les diverses etapes de la
+construcció. Recordar de {Etapes de la construcció}#stages-of-the-build que
+l'etapa *{bootstrap}* es quan el chroot s'omple inicialment per
+/{debootstrap}/ amb un sistema mínim i l'etapa *{chroot}* és quan
+s'utilitza el chroot per a la construcció de sistema d'fitxers del sistema
+en viu. D'aquesta manera, s'utilitzan els miralls corresponents per a
+aquestes etapes, i més tard, durant l'etapa *{binary}* s'utilitzan els
+valors #{--mirror-binary}# i #{--mirror-binary-security}# substituint
+qualsevol mirall utilitzat en una etapa anterior.
+
+3~distribution-mirrors-build-time Miralls de distribució utilitzats en temps
+de construcció
+
+Per establir els miralls de la distrubució utilitzats en temps de
+construcció perquè apuntin a una rèplica local, és suficient establir
+#{--mirror-bootstrap}#, #{--mirror-chroot-security}# i
+#{--mirror-chroot-backports}# de la manera següent.
code{
@@ -86,19 +94,20 @@ code{
}code
-The chroot mirror, specified by #{--mirror-chroot}#, defaults to the
-#{--mirror-bootstrap}# value.
+El mirall per al chroot, especificat per l'opció #{--mirror-chroot}#, per
+defecte pren el mateix valor que #{--mirror-bootstrap}#
-3~ Distribution mirrors used at run time
+3~ Miralls de distribució utilitzats en temps d'execució
-The #{--mirror-binary*}# options govern the distribution mirrors placed in
-the binary image. These may be used to install additional packages while
-running the live system. The defaults employ #{cdn.debian.net}#, a service
-that chooses a geographically close mirror based on the user's IP
-number. This is a suitable choice when you cannot predict which mirror will
-be best for all of your users. Or you may specify your own values as shown
-in the example below. An image built from this configuration would only be
-suitable for users on a network where "#{mirror}#" is reachable.
+Les opcions #{--mirror-binary*}# governen els miralls de distribució
+coŀlocats a la imatge binària. Aquestes poden ser utilitzades per instaŀlar
+paquets addicionals mentre s'executa el sistema en viu. Els valors per
+defecte utilitzan #{cdn.debian.net}#, un servei que tria un mirall
+geogràficament a prop en funció del número IP de l'usuari. Aquesta és una
+opció adequada quan no es pot predir quin serà el millor mirall per tots els
+usuaris. O es pot especificar els valors propis com es mostra en l'exemple
+següent. Una imatge construïda a partir d'aquesta configuració només seria
+convenient per als usuaris en una xarxa on "#{mirror}#" és abastable.
code{
@@ -107,19 +116,21 @@ code{
}code
-3~additional-repositories Additional repositories
+3~additional-repositories Repositoris addicionals
-You may add more repositories, broadening your package choices beyond what
-is available in your target distribution. These may be, for example, for
-backports, experimental or custom packages. To configure additional
-repositories, create #{config/archives/your-repository.list.chroot}#, and/or
-#{config/archives/your-repository.list.binary}# files. As with the
-#{--mirror-*}# options, these govern the repositories used in the *{chroot}*
-stage when building the image, and in the *{binary}* stage, i.e. for use
-when running the live system.
+És possible afegir més repositoris, ampliant les opcions de paquets més
+enllà dels disponibles en la pròpia distribució de destinació. Aquests poden
+ser, per exemple, per backports, experimentals o paquets personalitzats. Per
+configurar repositoris addicionals, crear els fitxers
+#{config/archives/your-repository.list.chroot}#, i/o
+#{config/archives/your-repository.list.binary}#. Igual que amb les opcions
+#{--mirror-*}# aquest regeix els repositoris utilitzats en l'étapa
+*{chroot}* durant la construcció de la imatge, i a l'étapa *{binary}*, és a
+dir, per ser utilitzades quan s'executa el sistema en viu.
-For example, #{config/archives/live.list.chroot}# allows you to install
-packages from the debian live snapshot repository at live system build time.
+Per exemple, #{config/archives/live.list.chroot}# permet d'instaŀlar paquets
+des del repositori de instantànies de debian live en el moment de creació
+del sistema viu.
code{
@@ -127,16 +138,16 @@ code{
}code
-If you add the same line to #{config/archives/live.list.binary}#, the
-repository will be added to your live system's #{/etc/apt/sources.list.d/}#
-directory.
+Si s'afegeix la mateixa línia a #{config/archives/live.list.binary}#, el
+repositori sera afegit al directori #{/etc/apt/sources.list.d/}# del sistema
+viu.
-If such files exist, they will be picked up automatically.
+Si aquests fitxers existeixen, seran utilitzats de forma automàtica.
-You should also put the GPG key used to sign the repository into
-#{config/archives/your-repository.key.{binary,chroot}}# files.
+També s'ha de posar la clau GPG utilitzada per signar el repositori en
+fitxers #{config/archives/your-repository.key.{binary,chroot}}#.
-*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:
+*{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:
code{
@@ -144,32 +155,36 @@ code{
}code
-2~choosing-packages-to-install Choosing packages to install
+2~choosing-packages-to-install Selecció dels paquets a instaŀlar
-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.
+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.
-3~package-lists Package lists
+3~package-lists Llistes de paquets
-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.
+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.
-*{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.
+*{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~ Predefined package lists
+3~ Llistes predefinides de paquets
-The simplest way to use lists is to specify one or more predefined lists
-with the #{--package-lists}# option. For example:
+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:
code{
@@ -177,40 +192,43 @@ code{
}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.
+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.
-3~ Local package lists
+3~ Llistes locals de paquets
-You may supplement the predefined lists using local package lists stored in
-#{config/package-lists/}#.
+Es poden completar les llistes predefinides mitjançant les llistes locals de
+paquets emmagatzemades a #{config/package-lists/}#.
-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.
+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
+adicional #{.chroot}# o #{.binary}# per indicar per a quina etapa és la
+llista.
-*{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.
+*{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.
-3~ Local binary package lists
+3~ Llistes locals de paquets per l'etapa binary
-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.
+Per crear una llista per a l'etapa binary, crear un fitxer amb el sufix
+#{.list.binary}# a #{config/package-lists/}#. Aquests paquets no s'instaŀlan
+al sistema de fitxers en viu però s'inclouen en els medis en viu a
+#{pool/}#. Un ús típic d'aquesta llista seria amb una de les variants del
+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~ Extending a provided package list using includes
+3~ Ampliació d'una llista mitjançant includes
-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.
+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.
-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:
+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:
code{
@@ -219,17 +237,18 @@ code{
}code
-3~ Using conditionals inside package lists
+3~ Ús de condicionals dins de les llistes de paquets
-Any of the live-build configuration variables stored in #{config/*}# (minus
-the #{LB_}# prefix) may be used in conditional statements in package
-lists. Generally, this means any #{lb config}# option uppercased and with
-dashes changed to underscores. But in practice, it is only the ones that
-influence package selection that make sense, such as #{DISTRIBUTION}#,
-#{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
+Qualsevol de les variables de configuració de live-build emmagatzemades a
+#{config/*}# (menys el prefix #{LB_}#) poden ser utilitzades en sentències
+condicionals en les llistes de paquets. En general, això significa qualsevol
+opció #{lb config}# en lletres majuscules i amb guions canviats a guions
+baixos. Però a la pràctica, només tenen sentit les que influeixen en la
+selecció de paquets, com ara #{DISTRIBUTION}#, #{ARCHITECTURES}# o
+#{ARCHIVE_AREAS}#.
-For example, to install #{ia32-libs}# if the #{--architectures amd64}# is
-specified:
+Per exemple, per instaŀlar #{ia32-libs}# si s'especifica #{--architectures
+amd64}#:
code{
@@ -239,9 +258,9 @@ code{
}code
-You may test for any one of a number of values, e.g. to install
-/{memtest86+}/ if either #{--architectures i386}# or #{--architectures
-amd64}# is specified:
+És possible fer un test d'un qualsevol d'un nombre de valors, per exemple
+per instaŀlar /{memtest86+}/ si s'especifica #{--architectures i386}# o
+#{--architectures amd64}#:
code{
@@ -251,9 +270,9 @@ code{
}code
-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
-via #{--archive-areas}#:
+També es pot provar amb variables que poden contenir més d'un valor, per
+exemple, per instaŀlar /{vrms}/ si s'especifica o #{contrib}# o #{non-free}#
+a través de l'opció #{--archive-areas}#:
code{
@@ -263,7 +282,7 @@ code{
}code
-A conditional may surround an #{#include}# directive:
+Un condicional pot envoltar una directiva #{#include}#:
code{
@@ -273,17 +292,17 @@ code{
}code
-The nesting of conditionals is not supported.
+No és possible el anidament dels condicionals.
-3~ Tasks
+3~ Tasques
-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.
+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{
@@ -292,35 +311,38 @@ code{
}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:
+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
+una mica de planificació i configuració extra. Les imatges en viu són
+diferentes de les imatges de l'instaŀlador de Debian en aquest sentit. A
+l'instaŀlador de Debian, si el medi es va preparar per obtenir un tipus
+entorn d'escriptori en particular, la tasca corresponent s'instaŀlarà
+automàticament. Per tant hi ha tasques internes #{gnome-desktop}#,
+#{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# cap de les quals
+s'ofereixen al menú de #{tasksel}#. De la mateixa manera, no hi ha cap
+entrada de menú per a les tasques de les llengües, però l'elecció del idioma
+de l'usuari durant la instaŀlació influeix en la selecció de les tasques de
+llengües corresponents.
+
+En el desenvolupament d'una imatge en viu d'escriptori, la imatge sol
+arrencar directament a un escriptori de treball, les opcions d'escriptori i
+de llengua han estat fetes en temps de construcció, no en temps d'execució
+com en el cas del instaŀlador de Debian. Això no vol dir que una imatge en
+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:
code{
@@ -330,10 +352,11 @@ code{
}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:
+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{
@@ -342,108 +365,116 @@ code{
}code
-This parameter can take multiple values, e.g. "lxde xfce" instead of "kde".
+Aquest paràmetre pot tenir diversos valors, per exemple "lxde xfce" en lloc
+de "kde".
-2~installing-modified-or-third-party-packages Installing modified or
-third-party packages
+2~installing-modified-or-third-party-packages Instaŀlació de paquets
+modificats o de tercers
-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.
+Si bé està en contra de la filosofia de Debian Live, de vegades pot ser
+necessària la construcció d'un sistema en viu amb versions modificades dels
+paquets que es troben al arxiu de Debian. Pot ser per modificar or donar
+suport a funcions addicionals, les llengües o les marques, o fins i tot per
+eliminar elements dels paquets existents que són indesitjables. De la
+mateixa manera, es poden utilitzar paquets de tercers per afegir alguna
+funcionalitat personalitzada i/o propietària.
-This section does not cover advice regarding building or maintaining
-modified packages. Joachim Breitner's 'How to fork privately' method from
+Aquesta secció no cobreix l'assessorament en matèria de construcció o
+manteniment de paquets modificats. Però el métode de Joachim Breitner's 'How
+to fork privately' a
http://www.joachim-breitner.de/blog/archives/282-How-to-fork-privately.html
-may be of interest, however. The creation of bespoke packages is covered in
-the Debian New Maintainers' Guide at http://www.debian.org/doc/maint-guide/
-and elsewhere.
+pot ser d'interès. La creació de paquets personalitzats es tracta a Debian
+New Maintainers' Guide at http://www.debian.org/doc/maint-guide/ i en altres
+llocs.
-There are two ways of installing modified custom packages:
+Hi ha dues formes d'instaŀlar paquets personalitzats modificats:
_* #{packages.chroot}#
-_* Using a custom APT repository
+_* L'ús d'un repositori APT personalitzat
-Using #{packages.chroot}# is simpler to achieve and useful for "one-off"
-customizations but has a number of drawbacks, whilst using a custom APT
-repository is more time-consuming to set up.
+Utilitzar #{packages.chroot}# és més fàcil d'aconseguir i útil per a
+personalitzacions "ràpides", però té una sèrie d'inconvenients, mentre que
+l'ús d'un repositori APT personalitzat és més costós en la quantitat de
+temps necessari.
-3~ Using #{packages.chroot}# to install custom packages
+3~ Fer servir #{packages.chroot}# per instaŀar paquets personalitzats
-To install a custom package, simply copy it to the
-#{config/packages.chroot/}# directory. Packages that are inside this
-directory will be automatically installed into the live system during build
-- you do not need to specify them elsewhere.
+Per instaŀar un paquet personalitzat, només s'ha de copiar al directori
+#{config/packages.chroot/}#. Els paquets que es troben dins d'aquest
+directori s'instaŀlaran automàticament en el sistema en viu durant la
+construcció - no cal especificar res més en cap altre lloc.
-Packages *{must}* be named in the prescribed way. One simple way to do this
-is to use #{dpkg-name}#.
+Els paquets *{han de}* ser nomenats en la forma prescrita. Una manera simple
+de fer això és utilitzar #{dpkg-name}#.
-Using #{packages.chroot}# for installation of custom packages has
-disadvantages:
+Utilitzar #{packages.chroot}# per a la instaŀlació de paquets personalitzats
+té els seus desavantatges:
-_* It is not possible to use secure APT.
+_* No és possible utilitzar APT segur.
-_* You must install all appropriate packages in the
-#{config/packages.chroot/}# directory.
+_* Cal posar tots els paquets apropiats al directori
+#{config/packages.chroot/}#.
-_* It does not lend itself to storing Debian Live configurations in revision
-control.
+_* No es presta per a l'emmagatzematge de configuracions de Debian Live en
+el control de revisió.
-3~ Using an APT repository to install custom packages
+3~ Fer servir un repositori APT per instaŀlar paquets personalitzats
-Unlike using #{packages.chroot}#, when using a custom APT repository you
-must ensure that you specify the packages elsewhere. See {Choosing packages
-to install}#choosing-packages-to-install for details.
+A diferència de #{packages.chroot}#, quan s'utilitza un repositori APT
+personalitzat s'ha d'assegurar que s'especifiquen els paquets en un altre
+lloc. Veure {Selecció dels paquets a instaŀlar}#choosing-packages-to-install
+per més detalls.
-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
-offer updates of the modified packages.
+Si bé crear un repositori APT per instaŀlar paquets personalitzats pot
+semblar un esforç innecessari, la infraestructura pot ser fàcilment
+reutilitzada en una data posterior per oferir actualitzacions dels paquets
+modificats.
-3~ Custom packages and APT
+3~ Paquets personalitzats i APT
-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
-(assuming a default configuration) given a package available in two
-different repositories with different version numbers, APT will elect to
-install the package with the higher version number.
+live-build utilitza APT per instaŀlar tots els paquets al sistema en viu per
+tant, heretarà els comportaments d'aquest programa. Un exemple rellevant és
+que (assumint una configuració per defecte) si es dóna el cas que un paquet
+està disponible en dos repositoris diferents, amb diferents números de
+versió, APT triarà per instaŀlar el paquet amb la versió més alta.
-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
-installed over one in the official Debian repositories. This may also be
-achieved by altering the live system's APT pinning preferences - see {APT
-pinning}#apt-pinning for more information.
+A causa d'això, s'aconsella augmentar el nombre de versió dels paquets
+personalitzats als fixers #{debian/changelog}# per assegurar-se que la
+versió modificada és la que s'instaŀla en lloc d'una dels repositoris
+oficials de Debian. Això també es pot aconseguir mitjançant l'alteració de
+les preferències d'APT del sistema en viu - veure {APT pinning}#apt-pinning
+per més informació.
-2~ Configuring APT at build time
+2~ Configurar APT en temps de construcció
-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
-in the normal way for live system contents, that is, by including the
-appropriate configurations through #{config/includes.chroot/}#.) For a
-complete list, look for options starting with #{apt}# in the #{lb_config}#
-man page.
+Es pot configurar APT a través d'una sèrie d'opcions que només s'apliquen en
+temps de construcció. (La configuració d'APT al sistema en funcionament en
+viu es pot fer de forma normal per als continguts del sistema en viu, és a
+dir, mitjançant la inclusió de les configuracions adequades a través de
+#{config/includes.chroot/}#.) Per obtenir una llista completa, buscar les
+opcions que comencen amb #{apt}# a la pàgina del manual de #{lb_config}#.
-3~choosing-apt-or-aptitude Choosing apt or aptitude
+3~choosing-apt-or-aptitude Seleccionar apt o aptitude
-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
-to #{lb config}#. Choose the method implementing the preferred behaviour for
-package installation, the notable difference being how missing packages are
-handled.
+Es pot optar per utilitzar /{apt}/ o /{aptitude}/ a l'hora d'instaŀlar
+paquets en temps de construcció. Quina utilitat s'usa es configura gràcies
+al argument #{--apt}# de #{lb config}#. Escollir el mètode d'implementació
+per al comportament preferit durant la instaŀlació de paquets, la diferència
+notable és la forma en que es manegen els paquets que falten.
-_* #{apt}#: With this method, if a missing package is specified, the package
-installation will fail. This is the default setting.
+_* #{apt}#: Amb aquest mètode, si un paquet que s'especifica falta,
+l'instaŀlació de paquets fallarà. Aquesta és la configuració per defecte.
-_* #{aptitude}#: With this method, if a missing package is specified, the
-package installation will succeed.
+_* #{aptitude}#: Amb aquest mètode, si s'especifica un paquet que falta,
+l'instaŀlació de paquets tindrà èxit.
-3~ Using a proxy with APT
+3~ L'ús d'un proxy amb APT
-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}#
-or #{--apt-http-proxy}# options as needed, e.g.
+Una configuració típica d'APT és per fer front a la construcció d'una imatge
+darrere d'un proxy. Es pot especificar el proxy per APT amb les opcions
+#{--apt-ftp-proxy}# o #{--apt-http-proxy}# segons sigui necessari, per
+exemple,
code{
@@ -451,14 +482,13 @@ code{
}code
-3~ Tweaking APT to save space
+3~ Afinar APT per estalviar espai
-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.
+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
+d'interès.
-If you don't want to include APT indices in the image, you can omit those
-with:
+Si no es vol incloure els índexs d'APT en la imatge, es poden omitir amb:
code{
@@ -466,14 +496,15 @@ code{
}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.
+Això no influirà en les entrades de #{/etc/apt/sources.list}#, sinó
+simplement si #{/var/lib/apt}# conté els fitxers dels índexs o no. El
+desavantatge és que APT necessita aquests índexs per tal d'operar en el
+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.
-If you find the installation of recommended packages bloats your image too
-much, you may disable that default option of APT with:
+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:
code{
@@ -481,38 +512,40 @@ 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.
-
-3~ Passing options to apt or aptitude
-
-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
-options through to your configured APT tool. See the man pages for #{apt}#
-and #{aptitude}# for details.
+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.
+
+3~ Passar opcions per a apt o aptitude
+
+Si no hi ha una opció #{lb config}# per modificar el comportament d'APT tal
+i com es necessita, utilitzar #{--apt-options}# o #{--aptitude-options}# per
+passar alguna opció a través de l'eina APT configurada. Consultar les
+pàgines del manual de #{apt}# i #{aptitude}# per a més detalls.
3~apt-pinning APT pinning
-For background, please first read the #{apt_preferences(5)}# man page. APT
-pinning can be configured either for build time, or else for run time. For
-the former, create #{config/chroot_apt/preferences}#. For the latter, create
+Com a referència, llegir primer la pàgina del manual
+#{apt_preferences(5)}#. Es pot configurar APT pinning tant pel temps de
+construcció, o bé per temps d'execució. En el primer cas, crear
+#{config/chroot_apt/preferences}#. Per aquest últim cas, crear
#{config/includes.chroot/etc/apt/preferences}#.
-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
-time. You need to add sid to your APT sources and pin it so that only the
-packages you want are installed from it at build time and all others are
-taken from the target system distribution, wheezy. The following will
-accomplish this:
+Suposem que s'està construint un sistema en viu wheezy però es necessita que
+tots els paquets en viu que acaben en la imatge binària s'instaŀlin desde
+sid en temps de construcció. Cal afegir sid a les fonts d'APT i fer un pin
+de manera que només els paquets que es vol s'instaŀlin en el moment de la
+construcció i tots els altres es preguin de la distribució de destinació,
+wheezy. El que segueix aconseguira això:
code{
@@ -529,7 +562,7 @@ code{
}code
-*{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:
+*{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:
code{
@@ -537,14 +570,14 @@ $ 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}#:
+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}#:
code{
diff --git a/manual/ca/user_customization-runtime.ssi b/manual/ca/user_customization-runtime.ssi
index 5d83783..47d89df 100644
--- a/manual/ca/user_customization-runtime.ssi
+++ b/manual/ca/user_customization-runtime.ssi
@@ -44,22 +44,21 @@ 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. 200-passwd) and add it to
+prefix it accordingly (e.g. 2000-passwd) and add it to
#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Customizing locale and language
-When the live system boots, language is involved in three steps:
+When the live system boots, language is involved in two steps:
_* the locale generation
-_* setting the keyboard layout for the console
+_* setting the keyboard configuration
-_* setting the keyboard layout for X
-
-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.
+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.
code{
@@ -67,26 +66,43 @@ code{
}code
-This parameter can also be used at the kernel command line. You can specify
-a locale by a full #{language_country.encoding}# word.
+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 depend on the
-#{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid
-options for X keyboard layouts can be found in
-#{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country
-codes). To find the value (the two characters) corresponding to a language
-try searching for the english name of the nation 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-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:
code{
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-To get the locale files for German and Swiss German keyboard layout in X
-use:
+Note that each variant lists the layout to which it applies in the
+description.
+
+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:
code{
@@ -94,28 +110,31 @@ code{
}code
-A list of the valid values of the keyboards for the console can be figured
-with the following command:
+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:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live \
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
}code
-Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then set your
-keyboard layout more precisely with #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
-live-boot will use also these parameters for X configuration. For example,
-to set up a French system with a French-Dvorak layout (called Bepo) on a
-TypeMatrix keyboard, both in console and X11, 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-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:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "keyboard-layouts=us,us keyboard-variant=,dvorak"
}code
@@ -180,7 +199,7 @@ label with one of the following:
code{
- $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
+ # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
}code
@@ -210,10 +229,10 @@ persistent in an ext4 filesystem on the /dev/sdb1 partition:
code{
- $ mkfs.ext4 -L persistence /dev/sdb1
- $ mount -t ext4 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live-persistence.conf
- $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
+ # mkfs.ext4 -L persistence /dev/sdb1
+ # mount -t ext4 /dev/sdb1 /mnt
+ # echo "/home" >> /mnt/live-persistence.conf
+ # echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
@@ -235,12 +254,12 @@ 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~ Persistence SubText
+3~ Using more than one persistence store
-If a user would need multiple persistence storage of the same type for
+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-subtext}# used in
+#{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-subtext=subText}#.
+boot parameters of: #{persistence}# #{persistence-label=subText}#.
diff --git a/manual/ca/user_examples.ssi b/manual/ca/user_examples.ssi
index 64e0a6b..25a1fb7 100644
--- a/manual/ca/user_examples.ssi
+++ b/manual/ca/user_examples.ssi
@@ -119,7 +119,7 @@ in {Managing a configuration}#managing-a-configuration.
code{
$ mkdir -p tutorial3/auto
- $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/
$ cd tutorial3
}code
@@ -138,6 +138,15 @@ code{
}code
+Perform #{lb config}# to generate the config tree, using the #{auto/config}#
+script you just created:
+
+code{
+
+ $ lb config
+
+}code
+
Now populate your local package list:
code{
diff --git a/manual/ca/user_managing_a_configuration.ssi b/manual/ca/user_managing_a_configuration.ssi
index 6deb8ad..79d297e 100644
--- a/manual/ca/user_managing_a_configuration.ssi
+++ b/manual/ca/user_managing_a_configuration.ssi
@@ -1,50 +1,53 @@
-:B~ Managing a configuration
-
-1~managing-a-configuration Managing a configuration
-
-This chapter explains how to manage a live configuration from initial
-creation, through successive revisions and successive releases of both the
-live-build software and the live image itself.
-
-2~ Use auto to manage configuration changes
-
-Live configurations rarely are perfect on the first try. You'll likely need
-to make a series of revisions until you are satisfied. However,
-inconsistencies can creep into your configuration from one revision to the
-next if you aren't careful. The main problem is, once a variable is given a
-default value, that value will not be recomputed from other variables that
-may change in later revisions.
-
-For example, when the distribution is first set, many 'dependent' variables
-are given default values that suit that distribution. However, if you later
-decide to change the distribution, those dependent variables continue to
-retain old values that are no longer appropriate.
-
-A second, related problem is that if you run #{lb config}# and then upgrade
-to a new version of live-build that has changed one of the variable names,
-you will discover this only by manual review of the variables in your
-#{config/*}# files, which you will then need to use to set the appropriate
-option again.
-
-All of this would be a terrible nuisance if it weren't for auto/* scripts,
-simple wrappers to the #{lb config}#, #{lb build}# and #{lb clean}# commands
-that are designed to help you manage your configuration. Simply create an
-auto/config script containing #{lb config}# command with all desired
-options, and an auto/clean that removes the files containing configuration
-variable values, and each time you 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/*}#).
+:B~ Gestió d'una configuració
+
+1~managing-a-configuration Gestió d'una configuració
+
+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}#
@@ -78,17 +81,17 @@ code{
}code
-We now ship example auto scripts with live-build based on the examples
-above. You may copy those as your starting point.
+Ara incloem scripts auto d'exemple amb live-build basats en els exemples
+anteriors. Es poden copiar com a punt de partida.
code{
- $ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
}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.
+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 04578d4..d5b0676 100644
--- a/manual/ca/user_overview.ssi
+++ b/manual/ca/user_overview.ssi
@@ -1,59 +1,60 @@
-:B~ Overview of tools
+:B~ Descripció general de les eines
-1~overview-of-tools Overview of tools
+1~overview-of-tools Descripció general de les eines
-This chapter contains an overview of the three main tools used in building
-Debian Live systems: live-build, live-boot and live-config.
+Aquest capítol conté un resum de les tres eines principals utilitzades en la
+construcció dels sistemes Debian Live: live-build, live-boot i live-config.
-2~live-build The live-build package
+2~live-build El paquet live-build
-live-build is a collection of scripts to build Debian Live systems. These
-scripts are also referred to as "commands".
+live-build és un conjunt de scripts per crear sistemes Debian Live. Aquests
+scripts també s'anomenen «ordres».
-The idea behind live-build is to be a framework that uses a configuration
-directory to completely automate and customize all aspects of building a
-Live image.
+La idea darrere de live-build és ser un marc que utilitza un directori de
+configuració per automatitzar completament i personalitzar tots els aspectes
+de la construcció d'una imatge en viu.
-Many concepts are similar to those in the /{debhelper}/ Debian package tools
-written by Joey Hess:
+Molts conceptes són similars als de les eines del paquet Debian
+/{debhelper}/ escrit per Joey Hess:
-_* The scripts have a central location for configuring their operation. In
-/{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For
-example, dh_install will look, amongst others, for a file called
-#{debian/install}# to determine which files should exist in a particular
-binary package. In much the same way, live-build stores its configuration
-entirely under a #{config/}# subdirectory.
+_* Els scripts tenen una ubicació central per a la configuració del seu
+funcionament. Amb /{debhelper}/ aquest és el subdirectori #{debian/}# d'un
+arbre de paquets. Per exemple, dh_install buscarà, entre altres, un arxiu
+anomenat #{debian/install}# per determinar quins fitxers han d'existir en un
+paquet binari en particular. De la mateixa manera, live-build emmagatzema la
+seva configuració per complet sota un subdirectori #{config/}#.
-_* The scripts are independent - that is to say, it is always safe to run
-each command.
+_* Els scripts són independents - és a dir, sempre és segur executar cada
+ordre.
-Unlike /{debhelper}/, live-build contains a tool to generate a skeleton
-configuration directory, #{lb config}#. This could be considered to be
-similar to tools such as /{dh-make}/. For more information about #{lb
-config}#, please see {The lb config command}#lb-config.
+A diferència de /{debhelper}/, live-build conté una eina per generar un
+directori de configuració en esquelet, #{lb config}#. Això podria ser
+considerat similar a eines com ara /{dh-make}/. Per obtenir més informació
+sobre #{lb config}#, veure {L'ordre lb config}#lb-config.
-The remainder of this section discusses the three most important commands:
+La resta d'aquesta secció descriu les tres ordres més importants:
-_* *{lb config}*: Responsible for initializing a Live system configuration
-directory. See {The lb config command}#lb-config for more information.
+_* *{lb config}*: Responsable de crear un directori de configuració per al
+sistema en viu. Consultar {L'ordre lb config}#lb-config per a més
+informació.
-_* *{lb build}*: Responsible for starting a Live system build. See {The lb
-build command}#lb-build for more information.
+_* *{lb build}*: Responsable d'iniciar la creació d'un sistema en
+viu. Consultar {L'ordre lb build}#lb-build per a més informació.
-_* *{lb clean}*: Responsible for removing parts of a Live system build. See
-{The lb clean command}#lb-clean for more information.
+_* *{lb clean}*: Responsable d'eliminar parts de la construcció d'un sistema
+viu. Consultar {L'ordre lb clean}#lb-clean per a més informació.
-3~lb-config The #{lb config}# command
+3~lb-config L'ordre #{lb config}#
-As discussed in {live-build}#live-build, the scripts that make up live-build
-read their configuration with the #{source}# command from a single directory
-named #{config/}#. As constructing this directory by hand would be
-time-consuming and error-prone, the #{lb config}# command can be used to
-create skeleton configuration folders.
+Com s'ha dit a {live-build}#live-build, les seqüències d'ordres que formen
+part de live-build llegeixen la seva configuració amb l'ordre #{source}#
+d'un únic directori anomenat #{config/}#. Com la construcció d'aquest
+directori a mà, seria molt costós i propens a errors, es pot utilitzar
+l'ordre #{lb config}# per crear carpetes de configuració en esquelet.
-Issuing #{lb config}# without any arguments creates a #{config/}#
-subdirectory which it populates with some default settings, and a skeleton
-#{auto/}# subdirectory tree.
+Executar #{lb config}# sense arguments crea un subdirectori #{config/}# que
+s'omple amb alguns paràmetres per defecte, i un arbre en esquelet de
+subdirectoris #{auto/}#.
code{
@@ -64,13 +65,14 @@ code{
}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).
+Utilitzar #{lb config}# sense cap tipus d'arguments seria convenient per als
+usuaris que necessiten una imatge molt bàsica, o que tinguin la intenció de
+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).
-Normally, you will want to specify some options. For example, to include the
-'gnome' package list in your configuration:
+Normalment, s'haurà d'especificar algunes opcions. Per exemple, per incloure
+la llista de paquets 'gnome' en la configuració:
code{
@@ -78,7 +80,7 @@ code{
}code
-It is possible to specify many options, such as:
+És possible especificar diverses opcions, com ara:
code{
@@ -86,43 +88,47 @@ code{
}code
-A full list of options is available in the #{lb_config}# man page.
+Una llista completa d'opcions està disponible a la pàgina del manual
+#{lb_config}#.
-3~lb-build The #{lb build}# command
+3~lb-build L'ordre #{lb build}#
-The #{lb build}# command reads in your configuration from the #{config/}#
-directory. It then runs the lower level commands needed to build your Live
-system.
+L'ordre #{lb build}# llegeix la configuració del directori #{config/}#. A
+continuació, executa les ordres de nivell inferior necessaries per construir
+el sistema en viu.
-3~lb-clean The #{lb clean}# command
+3~lb-clean L'ordre #{lb clean}#
-It is the job of the #{lb clean}# command to remove various parts of a build
-so subsequent builds can start from a clean state. By default, #{chroot}#,
-#{binary}# and #{source}# stages are cleaned, but the cache is left
-intact. Also, individual stages can be cleaned. For example, if you have
-made changes that only affect the binary stage, use #{lb clean --binary}#
-prior to building a new binary. See the #{lb_clean}# man page for a full
-list of options.
+L'ordre #{lb clean}# s'encarrega d'eliminar diverses parts d'una construcció
+per que altres construccions posteriors puguin començar des d'un estat
+net. Per defecte, es netegen les etapes #{chroot}#, #{binary}# i #{source}#,
+però la memòria cau es manté intacta. A més, es poden netejar etapes
+individuals. Per exemple, si s'han fet canvis que només afecten a la fase
+binary, utilitzar #{lb clean --binary}# abans de construir un nou
+binary. Veure la pàgina del manual de #{lb_clean}# per a una llista completa
+d'opcions.
-2~live-boot The live-boot package
+2~live-boot El paquet live-boot
-live-boot is a collection of scripts providing hooks for the
-initramfs-tools, used to generate an initramfs capable of booting live
-systems, such as those created by live-build. This includes the Debian Live
-ISOs, netboot tarballs, and USB stick images.
+live-boot és un conjunt de scripts per proporcionar hooks a initramfs-tools,
+que s'utilitzen per generar un initramfs capaç d'arrencar sistemes vius, com
+ara els creats per live-build. Això inclou les ISOs de Debian Live, netboot
+tarballs i imatges per a memòries USB.
-At boot time it will look for read-only media containing a #{/live/}#
-directory where a root filesystem (often a compressed filesystem image like
-squashfs) is stored. If found, it will create a writable environment, using
-aufs, for Debian like systems to boot from.
+En el moment d'arrencar, buscarà medis de només lectura que continguin un
+directori #{/live/}# on s'emmagatzema un sistema de fitxers arrel (sovint
+una imatge de un sistema de fitxers comprimit squashfs). Si el troba, crearà
+un entorn d'escriptura, utilitzant aufs, per que puguin arrencar sistemes
+com Debian o similars.
-More information on initial ramfs in Debian can be found in the Debian Linux
-Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter
-on initramfs.
+Més informació sobre ramfs inicial a Debian es pot trobar al Debian Linux
+Kernel Handbook http://kernel-handbook.alioth.debian.org/ al capítol sobre
+initramfs.
-2~live-config The live-config package
+2~live-config El paquet live-config
-live-config consists of the scripts that run at boot time after live-boot to
-configure the live system automatically. It handles such tasks as setting
-the hostname, locales and timezone, creating the live user, inhibiting cron
-jobs and performing autologin of the live user.
+live-config consta dels scripts que s'executen durant l'arrencada després de
+live-boot per a configurar el sistema en viu de forma automàtica. S'ocupa de
+tasques com ara l'establiment de les locales, el nom d'amfitrió, i la zona
+horària, crear l'usuari en viu, l'inhibició de tasques de cron i l'inici
+automàtic de sessió per l'usuari en viu.
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 43e2db1..a239b3b 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -24,7 +24,7 @@ werden können und diesen welche Superuser Rechte benötigen, sind den
Befehlen #{$}# respektive #{#}# vorangestellt. Dieses Symbol ist nicht Teil
des Befehls.
-Für die Ungeduldigen
+2~ Für die Ungeduldigen
Obowhl wir denken dass alles in diesem Handbuch mehr oder weniger für die
einen oder anderen Benutzer wichtig ist, sind wir uns bewusst, dass es sich
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index de1fca0..5f278d1 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Projekt <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2012 Debian Live Projekt
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
: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: 2012-06-27
+ :published: 27.07.2012
@publisher: Debian Live Projekt <debian-live at lists.debian.org>
diff --git a/manual/de/project_bugs.ssi b/manual/de/project_bugs.ssi
index a051509..eec3466 100644
--- a/manual/de/project_bugs.ssi
+++ b/manual/de/project_bugs.ssi
@@ -13,11 +13,12 @@ _* Always check first the image status updates on our homepage at
http://live.debian.net/ for known issues.
_* Always try to reproduce the bug with the *{most recent versions}* of
-live-build, live-boot, and live-config before submitting a bug report.
+live-build, live-boot, live-config and live-tools before submitting a bug
+report.
_* Try to give *{as specific information as possible}* about the bug. This
-includes (at least) the version of live-build, live-boot, and live-config
-used and the distribution of the live system you are building.
+includes (at least) the version of live-build, live-boot, live-config, and
+live-tools used and the distribution of the live system you are building.
2~ Known issues
@@ -71,6 +72,8 @@ _* Version of live-boot on the live system
_* Version of live-config on the live system
+_* Version of live-tools on the live system
+
_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
_* Architecture of the live system
@@ -89,8 +92,7 @@ code{
}code
-At boot time, live-boot stores a log in #{/var/log/live.log}# (or
-#{/var/log/live-boot.log}#).
+At boot time, live-boot stores a log in #{/var/log/live-boot.log}#.
Additionally, to rule out other errors, it is always a good idea to tar up
your #{config/}# directory and upload it somewhere (do *{not}* send it as an
@@ -118,7 +120,12 @@ increments.
2~ Use the correct package to report the bug against
-Where does the bug appear?
+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.
+
+However, we would appreciate if you try to narrow it down according to where
+the bug appears.
3~ At build time whilst bootstrapping
@@ -177,8 +184,8 @@ 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, and live-config to see whether something similar has been
-reported already.
+live-boot, live-config and live-tools to see whether something similar has
+been reported already.
2~ Where to report bugs
@@ -190,8 +197,9 @@ http://bugs.debian.org/. You can also submit the bugs by using the
In general, you should report build time errors against the live-build
package, boot time errors against live-boot, and run time errors against
live-config. If you are unsure of which package is appropriate or need more
-help before submitting a bug report, please send a message to the mailing
-list and we will help you to figure it out.
+help before submitting a bug report, please report it against the
+debian-live pseudo-package. We will then take care about it and reassign it
+where appropriate.
Please note that bugs found in distributions derived from Debian (such as
Ubuntu and others) should *{not}* be reported to the Debian BTS unless they
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index 05401eb..eddcc0b 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -358,8 +358,8 @@ next step is getting a higher level bootloader via the TFTP protocol. That
could be pxelinux, GRUB, or even boot directly to an operating system like
Linux.
-For example, if you unpack the generated #{binary-net.tar.gz}# archive in
-the #{/srv/debian-live}# directory, you'll find the filesystem image in
+For example, if you unpack the generated #{binary.netboot.tar.xz}# archive
+in the #{/srv/debian-live}# directory, you'll find the filesystem image in
#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
in #{tftpboot/debian-live/i386}#.
diff --git a/manual/de/user_customization-runtime.ssi b/manual/de/user_customization-runtime.ssi
index 5d83783..47d89df 100644
--- a/manual/de/user_customization-runtime.ssi
+++ b/manual/de/user_customization-runtime.ssi
@@ -44,22 +44,21 @@ 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. 200-passwd) and add it to
+prefix it accordingly (e.g. 2000-passwd) and add it to
#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Customizing locale and language
-When the live system boots, language is involved in three steps:
+When the live system boots, language is involved in two steps:
_* the locale generation
-_* setting the keyboard layout for the console
+_* setting the keyboard configuration
-_* setting the keyboard layout for X
-
-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.
+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.
code{
@@ -67,26 +66,43 @@ code{
}code
-This parameter can also be used at the kernel command line. You can specify
-a locale by a full #{language_country.encoding}# word.
+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 depend on the
-#{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid
-options for X keyboard layouts can be found in
-#{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country
-codes). To find the value (the two characters) corresponding to a language
-try searching for the english name of the nation 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-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:
code{
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-To get the locale files for German and Swiss German keyboard layout in X
-use:
+Note that each variant lists the layout to which it applies in the
+description.
+
+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:
code{
@@ -94,28 +110,31 @@ code{
}code
-A list of the valid values of the keyboards for the console can be figured
-with the following command:
+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:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live \
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
}code
-Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then set your
-keyboard layout more precisely with #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
-live-boot will use also these parameters for X configuration. For example,
-to set up a French system with a French-Dvorak layout (called Bepo) on a
-TypeMatrix keyboard, both in console and X11, 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-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:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "keyboard-layouts=us,us keyboard-variant=,dvorak"
}code
@@ -180,7 +199,7 @@ label with one of the following:
code{
- $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
+ # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
}code
@@ -210,10 +229,10 @@ persistent in an ext4 filesystem on the /dev/sdb1 partition:
code{
- $ mkfs.ext4 -L persistence /dev/sdb1
- $ mount -t ext4 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live-persistence.conf
- $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
+ # mkfs.ext4 -L persistence /dev/sdb1
+ # mount -t ext4 /dev/sdb1 /mnt
+ # echo "/home" >> /mnt/live-persistence.conf
+ # echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
@@ -235,12 +254,12 @@ 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~ Persistence SubText
+3~ Using more than one persistence store
-If a user would need multiple persistence storage of the same type for
+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-subtext}# used in
+#{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-subtext=subText}#.
+boot parameters of: #{persistence}# #{persistence-label=subText}#.
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 07e5172..933cb24 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -119,7 +119,7 @@ in {Managing a configuration}#managing-a-configuration.
code{
$ mkdir -p tutorial3/auto
- $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/
$ cd tutorial3
}code
@@ -138,6 +138,15 @@ code{
}code
+Perform #{lb config}# to generate the config tree, using the #{auto/config}#
+script you just created:
+
+code{
+
+ $ lb config
+
+}code
+
Now populate your local package list:
code{
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index 6deb8ad..a79f060 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -83,7 +83,7 @@ above. You may copy those as your starting point.
code{
- $ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
}code
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 4137e6e..db303d9 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2012-06-27
+ :published: 2012-07-27
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/project_bugs.ssi b/manual/en/project_bugs.ssi
index e5b5edc..8780c90 100644
--- a/manual/en/project_bugs.ssi
+++ b/manual/en/project_bugs.ssi
@@ -8,9 +8,9 @@ For the impatient:
_* Always check first the image status updates on our homepage at http://live.debian.net/ for known issues.
-_* Always try to reproduce the bug with the *{most recent versions}* of live-build, live-boot, and live-config before submitting a bug report.
+_* Always try to reproduce the bug with the *{most recent versions}* of live-build, live-boot, live-config and live-tools before submitting a bug report.
-_* Try to give *{as specific information as possible}* about the bug. This includes (at least) the version of live-build, live-boot, and live-config used and the distribution of the live system you are building.
+_* Try to give *{as specific information as possible}* about the bug. This includes (at least) the version of live-build, live-boot, live-config, and live-tools used and the distribution of the live system you are building.
2~ Known issues
@@ -46,6 +46,8 @@ _* Version of live-boot on the live system
_* Version of live-config on the live system
+_* Version of live-tools on the live system
+
_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
_* Architecture of the live system
@@ -62,7 +64,7 @@ code{
}code
-At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/live-boot.log}#).
+At boot time, live-boot stores a log in #{/var/log/live-boot.log}#.
Additionally, to rule out other errors, it is always a good idea to tar up your #{config/}# directory and upload it somewhere (do *{not}* send it as an attachment to the mailing list), so that we can try to reproduce the errors you encountered. If this is difficult (e.g. due to size) you can use the output of #{lb config --dump}# which produces a summary of your config tree (i.e. lists files in subdirectories of #{config/}# but does not include them).
@@ -74,7 +76,9 @@ If possible, isolate the failing case to the smallest possible change that break
2~ Use the correct package to report the bug against
-Where does the bug appear?
+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.
+
+However, we would appreciate if you try to narrow it down according to where the bug appears.
3~ At build time whilst bootstrapping
@@ -104,12 +108,12 @@ Before filing the bug, please search the web for the particular error message or
You should pay particular attention to the Debian Live mailing list, as well as the homepage, as these are likely to contain the most up-to-date information. If such information exists, always include the references to it in your bug report.
-In addition, you should check the current bug lists for live-build, live-boot, and live-config 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 been reported already.
2~ Where to report bugs
The Debian Live project keeps track of all bugs in the Debian Bug Tracking System (BTS). For information on how to use the system, please see http://bugs.debian.org/. You can also submit the bugs by using the #{reportbug}# command from the package with the same name.
-In general, you should report build time errors against the live-build package, boot time errors against live-boot, and run time errors against live-config. If you are unsure of which package is appropriate or need more help before submitting a bug report, please send a message to the mailing list and we will help you to figure it out.
+In general, you should report build time errors against the live-build package, boot time errors against live-boot, and run time errors against live-config. If you are unsure of which package is appropriate or need more help before submitting a bug report, please report it against the debian-live pseudo-package. We will then take care about it and reassign it where appropriate.
Please note that bugs found in distributions derived from Debian (such as Ubuntu and others) should *{not}* be reported to the Debian BTS unless they can be also reproduced on a Debian system using official Debian packages.
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index 3ff6ab0..a2cacfe 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -240,7 +240,7 @@ code{
In a network boot, the client runs a small piece of software which usually resides on the EPROM of the Ethernet card. This program sends a DHCP request to get an IP address and information about what to do next. Typically, the next step is getting a higher level bootloader via the TFTP protocol. That could be pxelinux, GRUB, or even boot directly to an operating system like Linux.
-For example, if you unpack the generated #{binary-net.tar.gz}# archive in the #{/srv/debian-live}# directory, you'll find the filesystem image in #{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader in #{tftpboot/debian-live/i386}#.
+For example, if you unpack the generated #{binary.netboot.tar.xz}# archive in the #{/srv/debian-live}# directory, you'll find the filesystem image in #{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader in #{tftpboot/debian-live/i386}#.
We must now configure three services on the server to enable netboot: the DHCP server, the TFTP server and the NFS server.
diff --git a/manual/en/user_customization-runtime.ssi b/manual/en/user_customization-runtime.ssi
index f355aab..6e021e7 100644
--- a/manual/en/user_customization-runtime.ssi
+++ b/manual/en/user_customization-runtime.ssi
@@ -29,19 +29,17 @@ 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. 200-passwd) and add it to #{config/includes.chroot/lib/live/config/}#
+One possible way of changing the default password is by means of a hook as described in {Boot-time hooks}#boot-time-hooks. In order to do that you can use the "passwd" hook from #{/usr/share/doc/live-config/examples/hooks}#, prefix it accordingly (e.g. 2000-passwd) and add it to #{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Customizing locale and language
-When the live system boots, language is involved in three steps:
+When the live system boots, language is involved in two steps:
_* the locale generation
-_* setting the keyboard layout for the console
+_* setting the keyboard configuration
-_* setting the keyboard layout for X
-
-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.
+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.
code{
@@ -49,18 +47,30 @@ code{
}code
-This parameter can also be used at the kernel command line. You can specify a locale by a full #{language_country.encoding}# word.
+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 depend on the #{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid options for X keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country codes). To find the value (the two characters) corresponding to a language try searching for the english name of the nation 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-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:
code{
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-To get the locale files for German and Swiss German keyboard layout in X use:
+Note that each variant lists the layout to which it applies in the description.
+
+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:
code{
@@ -68,21 +78,21 @@ code{
}code
-A list of the valid values of the keyboards for the console can be figured with the following command:
+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:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live \
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
}code
-Alternatively, you can use the #{console-setup}# package, a tool to let you configure console layout using X (XKB) definitions; you can then set your keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use also these parameters for X configuration. For example, to set up a French system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, both in console and X11, 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-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:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "keyboard-layouts=us,us keyboard-variant=,dvorak"
}code
@@ -120,7 +130,7 @@ If you already have a partition on your device, you could just change the label
code{
- $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
+ # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
}code
@@ -143,10 +153,10 @@ How custom overlay mounts are configured is described in full detail in the live
code{
- $ mkfs.ext4 -L persistence /dev/sdb1
- $ mount -t ext4 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live-persistence.conf
- $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
+ # mkfs.ext4 -L persistence /dev/sdb1
+ # mount -t ext4 /dev/sdb1 /mnt
+ # echo "/home" >> /mnt/live-persistence.conf
+ # echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
@@ -154,6 +164,6 @@ Then we reboot. During the first boot the contents of #{/home}# and #{/var/cache
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~ Persistence SubText
+3~ Using more than one persistence store
-If a user would need multiple persistence storage of the same type for different locations or testing, such as #{persistence-nonwork}# and #{persistence-work}#, the boot parameter #{persistence-subtext}# 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-subtext=subText}#.
+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}#.
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 6a72646..fcc2d44 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -82,7 +82,7 @@ Since we will be changing our personalized image over a number of revisions, and
code{
$ mkdir -p tutorial3/auto
- $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/
$ cd tutorial3
}code
@@ -101,6 +101,14 @@ code{
}code
+Perform #{lb config}# to generate the config tree, using the #{auto/config}# script you just created:
+
+code{
+
+ $ lb config
+
+}code
+
Now populate your local package list:
code{
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
index b8721d3..3aca901 100644
--- a/manual/en/user_managing_a_configuration.ssi
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -54,7 +54,7 @@ We now ship example auto scripts with live-build based on the examples above. Yo
code{
- $ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
}code
diff --git a/manual/es/about_manual.ssi b/manual/es/about_manual.ssi
index b6c20bd..9cdd1b5 100644
--- a/manual/es/about_manual.ssi
+++ b/manual/es/about_manual.ssi
@@ -188,7 +188,6 @@ Se puede realizar la construcción del manual posicionándose en el directorio
de nivel superior, o sea, en el directorio clonado mediante Git y ejecutando
la siguiente orden:
-
code{
$ make build
@@ -199,7 +198,6 @@ Ya que la construcción del manual para todos los idiomas soportados tarda un
rato, puede ser mejor crear un solo idioma. Esto puede realizarse ejecutando
la siguiente orden:
-
code{
$ make build LANGUAGES=en
@@ -229,10 +227,8 @@ de hacer grandes cambios, es conveniente enviarlos a la lista de correo para
discutirlos primero. Para realizar una entrega al repositorio se debe seguir
el siguiente procedimiento:
-
_* Obtener la clave pública de entrega:
-
code{
$ mkdir -p ~/.ssh/identity.d
@@ -247,7 +243,6 @@ code{
_* Añadir la siguiente sección en el fichero de configuración de
openssh-client:
-
code{
$ cat >> ~/.ssh/config << EOF
@@ -261,7 +256,6 @@ code{
_* Obtener un clon del manual mediante git utilizando ssh:
-
code{
$ git clone git at live.debian.net:/live-manual.git
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index 25ee007..8f764ab 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Este programa es software libre: puede ser redistribuido y/o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3
@date:
- :published: 2012-06-27
+ :published: 27.07.2012
@publisher: Proyecto Debian Live <debian-live at lists.debian.org>
diff --git a/manual/es/project_bugs.ssi b/manual/es/project_bugs.ssi
index f2f0c46..9b8e859 100644
--- a/manual/es/project_bugs.ssi
+++ b/manual/es/project_bugs.ssi
@@ -13,13 +13,13 @@ _* Primero, siempre se debe comprobar el estado actualizado de la imagen en
busca de problemas conocidos en la página web http://live.debian.net/.
_* Se debe intentar reproducir el error con las *{versiones más recientes}*
-de live-build, live-boot, y live-config antes de presentar un informe de
-errores.
+de live-build, live-boot, live-config y live-tools antes de presentar un
+informe de errores.
-_* Se debe intentar dar la *{información tan específica como sea posible}*
-acerca del error. Esto incluye (al menos) la versión de live-build,
-live-boot, y live-config utilizada y la distribución del sistema en vivo
-que está construyendo.
+_* Se debe intentar proporcionar *{una información tan específica como sea
+posible}* acerca del error. Esto incluye (al menos) la versión de
+live-build, live-boot, live-config y live-tools utilizada y la distribución
+del sistema en vivo que se está construyendo.
2~ Problemas conocidos
@@ -76,6 +76,8 @@ _* Versión de live-boot en el sistema en vivo.
_* Versión de live-config en el sistema en vivo.
+_* Versión de live-tools en el sistema en vivo.
+
_* Versión de /{debootstrap}/ y/o /{cdebootstrap}/ en el sistema anfitrión.
_* Arquitectura del sistema en vivo.
@@ -95,8 +97,8 @@ code{
}code
-En el momento del arranque, live-boot guarda un log en #{/var/log/live.log}#
-(o #{/var/log/live-boot.log}#).
+En el momento del arranque, live-boot guarda un log en
+#{/var/log/live-boot.log}#.
Además, para descartar otros errores, siempre es una buena idea comprimir en
un .tar el directorio #{config/}# y subirlo a algún lugar, para que el
@@ -126,7 +128,12 @@ más pequeños.
2~ Utilizar el paquete correcto sobre el que informar del error
-¿Dónde aparece el error?
+Si no se sabe qué componente es responsable del error o si el error es un
+error general relativo a los sistemas en vivo, se puede rellenar un informe
+de errores contra el pseudo-paquete debian-live.
+
+Sin embargo, se agradece si se intenta limitar la búsqueda a donde aparece
+el error.
3~ En la preinstalación (bootstrap) en tiempo de creación.
@@ -187,7 +194,8 @@ actualizada. Si esa información existe, se debe incluir la referencia a ella
en su informe de errores.
Además, se debe comprobar las listas de errores actuales de live-build,
-live-boot, y live-config y verificar si se ha informado ya de algo similar.
+live-boot, live-config y live-tools y verificar si se ha informado ya de
+algo similar.
2~ Dónde informar de los fallos
@@ -197,13 +205,13 @@ sobre cómo utilizar el sistema, consultar http://bugs.debian.org/. También
se puede enviar los errores mediante el comando #{reportbug}# del paquete
con el mismo nombre.
-En general, se debe informar sobre los errores en tiempo de creación en el
-BTS contra el paquete live-build. De los fallos en el tiempo de arranque
-contra el paquete live-boot, y de los errores en tiempo de ejecución contra
-el paquete live-config. Si no se está seguro de qué paquete es el adecuado o
-se necesita más ayuda antes de presentar un informe de errores, lo mejor es
-enviar un mensaje a la lista de correo y el equipo de Debian Live le ayudará
-a resolverlo.
+En general, se debe informar sobre los errores en tiempo de creación contra
+el paquete live-build. De los fallos en tiempo de arranque contra el paquete
+live-boot, y de los errores en tiempo de ejecución contra el paquete
+live-config. Si no se está seguro de qué paquete es el adecuado o se
+necesita más ayuda antes de presentar un informe de errores, lo mejor es
+enviar un informe contra el pseudo-paquete debian-live. Nosotros nos
+encargaremos de reasignarlo donde sea apropiado.
Hay que tener en cuenta que los errores que se encuentran en las
distribuciones derivadas de Debian (como Ubuntu y otros) *{NO}* deben
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index 55156de..ce9eb34 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -240,7 +240,8 @@ Crear una nueva máquina virtual, cambiar la configuración de almacenamiento
para utilizar #{binary.hybrid.iso}# como dispositivo CD/DVD y arrancar la
máquina.
-*{Nota:}* Para probar los sistemas en vivo con soporte X.org en /{virtualbox-ose}/, se puede incluir el paquete del driver de VirtualBox X.org, /{virtualbox-ose-guest-x11}/, en la configuración de live-build. De lo contrario, la resolución se limita a 800x600
+*{Nota:}* Para probar los sistemas en vivo con soporte X.org en /{virtualbox-ose}/, se puede incluir el paquete del driver de VirtualBox X.org, /{virtualbox-ose-guest-x11}/, en la configuración de live-build. De lo contrario, la resolución se limita a 800x600.
+
code{
$ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
@@ -260,6 +261,7 @@ una imagen HDD si se desea utilizar el espacio restante en los medios de
almacenamiento para una partición con persistencia.
*{Nota:}* si se ha creado una imagen ISO híbrida con el ejemplo anterior, se tendrá que limpiar el directorio de trabajo con el comando #{lb clean}# (ver {El comando lb clean}#lb-clean):
+
code{
# lb clean --binary
@@ -332,6 +334,7 @@ code{
}code
{Nota:}* Si se desea usar el espacio extra con Windows, segun parece, ese sistema operativo no puede acceder normalmente a otra partición más que a la primera. Se han comentado algunas soluciones a este problema en nuestra {lista de correo}#contact pero según parece no hay una solución fácil.
+
*{Recordar: Cada vez que se instale una nueva binary.img en el dispositivo, todos los datos del dispositivo se perderán debido a que la tabla de particiones se sobrescribe con el contenido de la imagen, así pues, realizar primero una copia de seguridad de la partición para poder restaurarla trás actualizar la imagen en vivo.}*
2~building-netboot-image Creación de una imagen de arranque en red
@@ -341,6 +344,7 @@ básica que contendrá el sistema estándar de Debian sin X.org. Se puede usar
para el arranque en red.
*{Nota:}* si se ha seguido algúno de los ejemplos anteriores, se tendrá que limpiar el directorio de trabajo con el comando #{lb clean}#:
+
code{
# lb clean --binary
@@ -380,8 +384,8 @@ conseguir un gestor de arranque de alto nivel a través del protocolo
TFTP. Este gestor podría ser PXELINUX, GRUB, o incluso arrancar directamente
un sistema operativo como Linux.
-Por ejemplo, si se descomprime el archivo generado #{binary-net.tar.gz}# en
-el directorio #{/srv/debian-live}#, se verá la imagen del sistema de
+Por ejemplo, si se descomprime el archivo generado #{binary.netboot.tar.xz}#
+en el directorio #{/srv/debian-live}#, se verá la imagen del sistema de
ficheros en #{live/filesystem.squashfs}# y el kernel, initrd y el gestor de
arranque pxelinux en #{tftpboot/debian-live/i386}#.
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index 81d9c09..b37e67f 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -186,7 +186,8 @@ 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.
-*{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 .
+*{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
La forma más simple de utilizar listas de paquetes es especificar una o más
@@ -215,7 +216,7 @@ directorio deben tener la extensión #{.list}# además de la extensión de la
etapa #{.chroot}# o #{.binary}# para indicar a qué etapa corresponde la
lista.
-*{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}#
+*{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}#.
3~ Listas de paquetes locales para binary
@@ -298,7 +299,10 @@ Es habitual que una condición incluya una directiva «include»:
code{
-
+ #if ARCHITECTURES amd64
+ #include <gnome-full>
+ #endif
+
}code
No se permite el anidamiento de estructuras condicionales.
@@ -578,7 +582,7 @@ code{
}code
-*{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:
+*{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:
code{
diff --git a/manual/es/user_customization-runtime.ssi b/manual/es/user_customization-runtime.ssi
index b455ef8..c3da032 100644
--- a/manual/es/user_customization-runtime.ssi
+++ b/manual/es/user_customization-runtime.ssi
@@ -50,22 +50,20 @@ Una posible forma de cambiar la contraseña por defecto es usando un script
gancho (hook) tal y como se describe en {Scripts gancho en tiempo de
arranque}#boot-time-hooks. Para conseguirlo se puede usar el script gancho
«passwd» de #{/usr/share/doc/live-config/examples/hooks}#, ponerle un
-prefijo adecuado (p.ej. 200-passwd) y añadirlo a
+prefijo adecuado (p.ej. 2000-passwd) y añadirlo a
#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Personalización de las variantes locales e
idioma
-Cuando el sistema en vivo arranca, el idioma está implicado en tres pasos:
+Cuando el sistema en vivo arranca, el idioma está implicado en dos pasos:
_* Generar las variantes locales
-_* Establecer la distribución del teclado para el consola
-
-_* Establecer la distribución del teclado para el entorno gráfico X
+_* Establecer la distribución del teclado
La variante local predeterminada en la creación de un sistema en vivo es
-"locales=en_US.UTF-8". Para definir la variante local que se debe generar,
+#{locales=en_US.UTF-8}#. Para definir la variante local que se debe generar,
se puede utilizar el parámetro #{locales}# en la opción
#{--bootappend-live}# de #{lb config}#, p.ej.
@@ -75,27 +73,45 @@ code{
}code
-Este parámetro también se puede utilizar en la línea de comandos del
-kernel. Se puede especificar una variante local de esta forma:
-#{language_country.encoding}#.
-
-Tanto la configuración del teclado de la consola y del entorno gráfico X
-dependen del parámetro #{keyboard-layouts}# de la opción
-#{--bootappend-live}#. Se pueden encontrar opciones válidas de la
-disposición del teclado en #{/usr/share/X11/xkb/rules/base.xml}# (bastante
-limitado a los códigos de país de dos letras). Para hallar el valor (los dos
-letras) que corresponde a un idioma se puede buscar el nombre en inglés de
-la nación donde se habla el idioma, por ejemplo:
+Se pueden especificar diversas variantes locales separándolas con comas.
+
+Este parámetro se puede utilizar en la línea de comandos del kernel, al
+igual que los parámetros de configuración del teclado indicados a
+continuación. Es posibe configurar una variante local con #{idioma_país}#
+(en cuyo caso se utiliza el tipo de codificación por omisión) o también con
+la expresión completa #{idioma_país.codificación}#. La lista de todas las
+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-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 el idioma, por ejemplo:
code{
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-Por ejemplo, para obtener los ficheros de la variante local de la
-disposición del teclado alemán y suizo-alemán en X usar:
+Cada variante muestra una descripción de la disposición que aplica.
+
+Normalmente, sólo es necesario configurar la disposición del teclado. Por
+ejemplo, para obtener los ficheros de la variante local de la disposición
+del teclado alemán y suizo-alemán en X utilizar:
code{
@@ -103,29 +119,33 @@ code{
}code
-Se puede ver una lista de los valores de teclados válidos para la consola
-con el siguiente comando:
+Sin enbargo, para casos de uso muy específicos, se puede incluir otros
+parámetros. Por ejemplo, para configurar un sistema Francés con una
+disposición French-Dvorak (también llamado Bepo) en un teclado USB
+TypeMatrix EZ-Reach 2030, utilizar:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live \
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
}code
-Alternativamente, se puede usar el paquete #{console-setup}# una herramienta
-que permite configurar la disposición de la consola utilizando definiciones
-X (XKB), a continuación, se puede configurar el teclado con mayor precisión
-con las variables #{keyboard-layouts}#, #{keyboard-variant}#,
-#{keyboard-options}# y #{keyboard-model}#; live-boot también usará estos
-parámetros para la configuración de X. Por ejemplo, para establecer un
-sistema francés con una distribución de teclas francés-Dvorak (llamado Bepo)
-en un teclado TypeMatrix, tanto en consola X como X11, se puede utilizar:
+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 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 \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "keyboard-layouts=us,us keyboard-variant=,dvorak"
}code
@@ -199,7 +219,7 @@ etiqueta con uno de los siguientes:
code{
- $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
+ # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
}code
@@ -231,10 +251,10 @@ ext4 en la partición /dev/sdb1:
code{
- $ mkfs.ext4 -L persistence /dev/sdb1
- $ mount -t ext4 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live-persistence.conf
- $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
+ # mkfs.ext4 -L persistence /dev/sdb1
+ # mount -t ext4 /dev/sdb1 /mnt
+ # echo "/home" >> /mnt/live-persistence.conf
+ # echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
@@ -257,13 +277,13 @@ en el mismo fichero #{live-persistence.conf}#. Consultar la página de manual
de live-persistence.conf(5) para ver como manejar ese caso si realmente es
necesario. (aclaración: normalmente no lo es).
-3~ SubText persistente
+3~ Utilizar varios medios persistentes
Si un usuario necesita un almacenamiento persistente múltiple del mismo tipo
para diferentes lugares o pruebas, tales como #{persistence-nonwork}# y
-#{persistence-work}#, el parámetro de arranque #{persistence-subtext}# usado
+#{persistence-work}#, el parámetro de arranque #{persistence-label}# usado
junto con el parámetro de arranque #{persistence}# permitirá medios de
almacenamiento persistentes múltiples pero únicos. Un ejemplo sería, si un
usuario desea utilizar una partición persistente etiquetada
#{persistence-subText}# usaría los parámetros de arranque: #{persistence}#
-#{persistence-subtext=subText}#.
+#{persistence-label=subText}#.
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index 34c2a75..04d0351 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -129,7 +129,7 @@ configuración}#managing-a-configuration.
code{
$ mkdir -p tutorial3/auto
- $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/
$ cd tutorial3
}code
@@ -148,6 +148,15 @@ code{
}code
+Ejecutar #{lb config}# para generar el árbol de configuración, utilizando el
+script #{auto/config}# que justo se acaba de crear:
+
+code{
+
+ $ lb config
+
+}code
+
Completar la lista de paquetes local:
code{
@@ -212,7 +221,8 @@ Añadir ahora el paquete /{vlc}/ a nuestra lista de paquetes local en
code{
-
+ $ echo vlc >> config/package-lists/my.list.chroot
+
}code
Crear de nuevo:
@@ -360,7 +370,8 @@ tasksel-data, para proceder, asegurarse de tener ambas cosas:
code{
-
+ # apt-get install dctrl-tools tasksel-data
+
}code
Ahora podemos buscar las tareas apropiadas, primero con:
diff --git a/manual/es/user_managing_a_configuration.ssi b/manual/es/user_managing_a_configuration.ssi
index 24183b2..910524d 100644
--- a/manual/es/user_managing_a_configuration.ssi
+++ b/manual/es/user_managing_a_configuration.ssi
@@ -96,7 +96,7 @@ con copiar estos scripts como punto de partida.
code{
- $ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
}code
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 26057d2..e5ff735 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Ce programme est un logiciel libre; vous pouvez le redistribuer ou le modifier suivant les termes de la Licence Générale Publique GNU telle que publiée par la Free Software Foundation: soit la version 3 de cette licence, soit (à votre gré) toute version ultérieure.<br><br>Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE: sans même la garantie implicite de COMMERCIALISABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.<br><br>Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez http://www.gnu.org/licenses/. <br><br>Le texte complet de la Licence Générale Publique GNU peut être trouvé dans le fichier / usr/share/common-licenses/GPL-3
@date:
- :published: 2012-06-27
+ :published: 27.07.2012
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index 4330b76..f48b7c7 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -15,13 +15,13 @@ l'image sur notre page d'accueil http://live.debian.net/ pour voir les
problèmes connus.
_* Toujours essayer de reproduire le bogue avec *{les versions les plus
-récentes}* de live-build, live-boot, et live-config avant de présenter un
-rapport de bogue.
+récentes}* de live-build, live-boot, live-config et live-tools avant de
+présenter un rapport de bogue.
_* Essayez de donner des informations aussi précises que possible sur le
-bogue. Cela comprend (au moins) la version de live-build, live-boot et
-live-config, de la distribution utilisée et du système live que vous
-construisez.
+bogue. Cela comprend (au moins) la version de live-build, live-boot,
+live-config et live-tools, de la distribution utilisée et du système live
+que vous construisez.
2~ Problèmes connus
@@ -78,6 +78,8 @@ _* Version de live-boot sur le système live
_* Version de live-config sur le système live
+_* Version de live-tools sur le système live
+
_* Version de /{debootstrap}/ et/ou /{cdebootstrap}/ sur le système hôte
_* L'architecture du système live
@@ -97,8 +99,7 @@ code{
}code
-Au démarrage, live-boot stocke un journal dans #{/var/log/live.log}# (ou
-#{/var/log/live-boot.log}#).
+Au démarrage, live-boot stocke un journal dans #{/var/log/live-boot.log}#.
Par ailleurs, pour écarter d'autres erreurs, c'est toujours une bonne idée
faire un tar de votre répertoire #{config/}# et de le télécharger quelque
@@ -128,7 +129,12 @@ developper en petits incréments.
2~ Utilisez le paquet adéquat pour rapporter le bogue
-Où est-ce que le bogue apparaît?
+Si vous ne savez pas quel composant est responsable du bogue ou si le bogue
+est un bogue général concernant les systèmes live, vous pouvez remplir un
+bogue sur le pseudo-paquet debian-live.
+
+Toutefois, nous apprécierons si vous essayez de le réduire en fonction de
+l'endroit où le bogue apparaît.
3~ Au moment de la construction tandis l'amorçage
@@ -189,8 +195,8 @@ contenir des informations à jour. Si ces informations existent, toujours
inclure les références au sein de vos rapport de bogues.
En outre, vous devriez vérifier les listes de bogues en cours de live-build,
-live-boot, et live-config pour voir si quelque chose de semblable n'a été
-déjà signalée.
+live-boot, live-config et live-tools pour voir si quelque chose de
+semblable n'a été déjà signalée.
2~ Où rapporter les bogues
@@ -204,8 +210,8 @@ En général, vous devez signaler les erreurs de construction contre le paquet
live-build, les erreurs en temps de démarrage contre live-boot, et les
erreurs d'exécution contre live-config. Si vous n'êtes pas sûr de quel
paquet est approprié ou avez besoin d'aide avant de soumettre un rapport de
-bogue, s'il vous plaît envoyez un message à la liste de diffusion et nous
-vous aiderons à décider.
+bogue, s'il vous plaît signalez le rapport contre le pseudo-paquet
+debian-live. Nous le réattribuerons s'il y a lieu.
S'il vous plaît notez que les bogues trouvés dans les distributions dérivées
de Debian (comme Ubuntu et autres) *{ne}* doivent *{pas}* être rapportés au
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index f9b4232..533d399 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -238,6 +238,7 @@ pour utiliser #{binary.hybrid.iso}# comme le périphérique CD/DVD et démarrer
la machine.
*{Remarque:}* Pour les systèmes live contenant X.org que vous voulez essayer avec /{virtualbox-ose}/, vous pouvez inclure le paquet des pilotes VirtualBox X.org, /{virtualbox-ose-guest-x11}/, dans votre configuration de live-build. Sinon, la résolution est limitée à 800x600.
+
code{
$ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
@@ -257,6 +258,7 @@ l'espace disponible sur le support à certaines fins, tel que la persistance
d'une partition, vous devez utiliser une image HDD.
*{Remarque:}* si vous avez créé une image ISO hybride avec l'exemple précédent, vous devrez nettoyer votre répertoire de travail avec la commande #{lb clean}# (voir {La commande lb clean}#lb-clean):
+
code{
# lb clean --binary
@@ -329,6 +331,7 @@ code{
}code
*{Remarque:}* Si vous voulez utiliser l'espace supplémentaire avec Windows, apparemment cet OS ne peut normalement pas accéder à n'importe quelle partition, mais la première. Certaines solutions à ce problème ont été discutées sur notre {liste de diffusion}#contact, mais il semble qu'il n'y a pas de réponses faciles.
+
*{Rappelez-vous: Chaque fois que vous installez une nouvelle binary.img sur la clé, toutes les données sur la clé seront perdues parce que la table de partition est écrasée par le contenu de l'image, vous devez sauvegarder votre partition supplémentaire d'abord la restaurer à nouveau après la mise à jour de l'image live.}*
2~building-netboot-image Construction d'une image netboot
@@ -338,6 +341,7 @@ contenant le système Debian standard sans X.org. Elle peut être démarrée sur
le réseau.
*{Remarque:}* Si vous avez réalisé quelque des exemples précédents, vous aurez besoin de nettoyer votre répertoire de travail avec la commande #{lb clean}#:
+
code{
# lb clean --binary
@@ -377,10 +381,11 @@ chargeur d'amorçage de niveau supérieur via le protocole TFTP. Cela pourrait
être pxelinux, GRUB, ou démarrer directement à un système d'exploitation
comme Linux.
-Par exemple, si vous décompressez le fichier généré #{binary-net.tar.gz}#
-dans le répertoire #{/srv/debian-live}#, vous trouverez l'image du système
-de fichiers dans #{live/filesystem.squashfs}# et le noyau, initrd et le
-chargeur d'amorçage pxelinux dans #{tftpboot/debian-live/i386}#.
+Par exemple, si vous décompressez le fichier généré
+#{binary.netboot.tar.xz}# dans le répertoire #{/srv/debian-live}#, vous
+trouverez l'image du système de fichiers dans #{live/filesystem.squashfs}#
+et le noyau, initrd et le chargeur d'amorçage pxelinux dans
+#{tftpboot/debian-live/i386}#.
Nous devons maintenant configurer trois services sur le serveur pour activer
le démarrage sur le réseau: le serveur DHCP, serveur TFTP et le serveur NFS.
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index fe825a8..dac3f1e 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -49,23 +49,21 @@ Une façon possible de changer le mot de passe par défaut est au moyen d'un
hook comme décrit dans {Hooks au moment du démarrage}#boot-time-hooks. Pour
ce faire vous pouvez utiliser le hook "passwd" de
#{/usr/share/doc/live-config/examples/hooks}#, ajouter un préfixe correct
-(par exemple 200-passwd) et l'ajouter à
+(par exemple 2000-passwd) et l'ajouter à
#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Personnalisation des paramètres régionaux
et de la langue
-Au démarrage du système live, la langue est impliquée dans trois étapes:
+Au démarrage du système live, la langue est impliquée dans deux étapes:
_* la génération des paramètres régionaux
-_* réglage de la disposition du clavier pour la console
-
-_* réglage de la disposition du clavier pour X
+_* le réglage de la disposition du clavier
Les paramètres régionaux par défaut pendant la construction d'un système
-Live sont "locales=en_US.UTF-8". Pour définir les paramètres régionaux qui
-doivent être générés, utilisez le paramètre #{locales}# dans l'option
+Live sont #{locales=en_US.UTF-8}#. Pour définir les paramètres régionaux qui
+doivent être générés, utiliser le paramètre #{locales}# dans l'option
#{--bootappend-live}# de #{lb config}#, par exemple
code{
@@ -74,26 +72,44 @@ code{
}code
-Ce paramètre peut également être utilisé à la ligne de commande du
-noyau. Vous pouvez spécifier des paramètres régionaux par
-#{language_country.encoding}#.
-
-Tant la console et la configuration du clavier X dépendent du paramètre
-#{keyboard-layouts}# de l'option #{--bootappend-live}#. Les options valides
-pour les dispositions des claviers X peuvent être trouvés dans
-#{/usr/share/X11/xkb/rules/base.xml}# (plutôt limitées à des codes des pays
-à deux lettres). Pour trouver la valeur (les deux caractères),
-correspondante à une langue essayez de rechercher le nom anglais de la
-nation où la langue est parlée, par exemple:
+Multiples paramètres régionaux peuvent être spécifiés en une liste séparée
+par des virgules.
+
+Ce paramètre, ainsi que les paramètres de configuration du clavier indiqués
+ci-dessous, peut également être utilisé sur la ligne de commande du
+noyau. On peut spécifier des paramètres régionaux avec #{language_country}#
+(dans ce cas le codage par défaut est utilisé) ou l'expression complete
+#{language_country.encoding}#. Une liste des paramètres régionaux et le
+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
+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 nation où la langue est parlée, par exemple:
code{
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-Pour obtenir les fichiers des paramètres régionaux de l'allemand et la
+Chaque variante présente une description de la disposition appliquée.
+
+Souvent, seulement la disposition doit être configurée. Par exemple, pour
+obtenir les fichiers des paramètres régionaux de l'allemand et la
disposition du clavier suisse allemand dans X utiliser:
code{
@@ -102,29 +118,32 @@ code{
}code
-Une liste des valeurs valides des claviers pour la console peut être figurée
-avec la commande suivante:
+Toutefois, pour les cas d'utilisation très spécifiques, on peut inclure
+d'autres paramètres. Par exemple, pour mettre en place un système français
+avec une disposition French-Dvorak (Bepo) avec un clavier USB TypeMatrix
+EZ-Reach 2030, utiliser:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live \
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
}code
-Alternativement, vous pouvez utiliser le paquet #{console-setup}#, un outil
-pour vous aider à configurer la disposition de la console en utilisant
-définitions X (XKB), vous pouvez alors définir votre clavier plus
-précisément avec variables #{keyboard-layouts}#, #{keyboard-variant}#,
-#{keyboard-options}# et #{keyboard-model}#; live-boot pourra également
-utiliser ces paramètres pour la configuration de X. Par exemple, pour mettre
-en place un système français avec une disposition Français Dvorak (appelée
-Bepo) sur un clavier TypeMatrix, à la fois dans la console et X11, utilisez:
+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:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "keyboard-layouts=us,us keyboard-variant=,dvorak"
}code
@@ -196,7 +215,7 @@ modifier l'étiquette avec l'un des suivants:
code{
- $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
+ # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
}code
@@ -229,10 +248,10 @@ système de fichiers ext4 sur la partition /dev/sdb1:
code{
- $ mkfs.ext4 -L persistence /dev/sdb1
- $ mount -t ext4 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live-persistence.conf
- $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
+ # mkfs.ext4 -L persistence /dev/sdb1
+ # mount -t ext4 /dev/sdb1 /mnt
+ # echo "/home" >> /mnt/live-persistence.conf
+ # echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
@@ -256,13 +275,13 @@ imbriqués est problématique s'ils sont énumérés dans le même fichier
pour savoir comment gérer ce cas, si vous avez vraiment besoin (remarque:
vous n'avez généralement pas).
-3~ SubText persistant
+3~ Utilisation de plusieurs dispositifs de persistance
Si un utilisateur a besoin de stockages persistants multiples du même type
pour différents endroits ou l'essai, tel que #{persistence-nonwork}# et
-#{persistence-work}#, le paramètre de démarrage #{persistence-subtext}#
+#{persistence-work}#, le paramètre de démarrage #{persistence-label}#
utilisé en conjonction avec le paramètre de démarrage #{persistence}#
permettra multiples, mais uniques, supports persistants. Un exemple serait
le cas si un utilisateur voudrait utiliser une partition persistante
étiquetée #{persistence-subText}# il utiliserait les paramètres de
-démarrage: #{persistence}# #{persistence-subtext=subText}#.
+démarrage: #{persistence}# #{persistence-label=subText}#.
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 0618967..63ff18f 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -129,7 +129,7 @@ dans {Gestion d'une configuration}#managing-a-configuration.
code{
$ mkdir -p tutorial3/auto
- $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/
$ cd tutorial3
}code
@@ -148,6 +148,15 @@ code{
}code
+Exécutez #{lb config}# pour générer l'arbre de configuration, en utilisant
+le script #{auto/config}# que vous avez crée:
+
+code{
+
+ $ lb config
+
+}code
+
Maintenant remplir votre liste de paquets locaux:
code{
diff --git a/manual/fr/user_managing_a_configuration.ssi b/manual/fr/user_managing_a_configuration.ssi
index 9bcf765..05715b1 100644
--- a/manual/fr/user_managing_a_configuration.ssi
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -88,7 +88,7 @@ des exemples ci-dessus. Vous pouvez copier ces comme point de départ.
code{
- $ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
}code
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 4a36591..021478e 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2012-06-27
+ :published: 2012-07-27
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/project_bugs.ssi b/manual/it/project_bugs.ssi
index f822c9d..ea9a6ad 100644
--- a/manual/it/project_bugs.ssi
+++ b/manual/it/project_bugs.ssi
@@ -12,13 +12,13 @@ Per gli impazienti
_* Per i problemi noti verificare sempre lo stato degli aggiornamenti
dell'immagine sulla nostra pagina iniziale http://live.debian.net/.
-_* Prima di inviare una segnalazione di bug provare a riprodurlo con le
-*{versione più recenti}* di live-build, live-boot e live-config.
+_* Always try to reproduce the bug with the *{most recent versions}* of
+live-build, live-boot, live-config and live-tools before submitting a bug
+report.
-_* Si cerchi di fornire *{informazioni il più dettagliate possibile}*
-riguardo il bug. Questo comprende (almeno) la versione di live-build,
-live-boot e live-config utilizzata e la distribuzione del sistema live che
-si sta costruendo.
+_* Try to give *{as specific information as possible}* about the bug. This
+includes (at least) the version of live-build, live-boot, live-config, and
+live-tools used and the distribution of the live system you are building.
2~ Problemi noti
@@ -75,6 +75,8 @@ _* Versione di live-boot sul sistema ospitante
_* Versione di live-config sul sistema live
+_* Version of live-tools on the live system
+
_* Versione di /{debootstrap}/ o /{cdebootstrap}/ sul sistema ospitante
_* Architettura del sistema live
@@ -94,8 +96,7 @@ code{
}code
-All'avvio, live-boot conserva un registro in #{/var/log/live.log}# (or
-#{/var/log/live-boot.log}#).
+At boot time, live-boot stores a log in #{/var/log/live-boot.log}#.
Inoltre, per escludere altri errori, è sempre una buona idea creare un tar
della propria directory #{config/}# e caricarlo da qualche parte (*{non}*
@@ -123,7 +124,12 @@ e bisogna cambiare approccio.
2~ Segnalare il bug del pacchetto giusto
-Dove appare il bug?
+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.
+
+However, we would appreciate if you try to narrow it down according to where
+the bug appears.
3~ Durante la compilazione mentre esegue il bootstrap
@@ -181,9 +187,9 @@ così come la pagina iniziale del sito, in quanto contengono informazioni più
aggiornate. Se tale informazione esiste si includa sempre un riferimento
nella segnalazione del bug.
-In aggiunta bisogna controllare l'attuale elenco dei bug riguardanti
-live-build, live-boot e live-config per vedere se sia già stato segnalato
-qualcosa di simile.
+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.
2~ Dove segnalare i bug
@@ -192,11 +198,12 @@ System (BTS, sistema di tracciamento dei bug Debian), si veda
http://bugs.debian.org/ per le informazioni su come usarlo. È anche
possibile utilizzare il comando #{reportbug}# dall'omonimo pacchetto.
-In genere bisogna riportare gli errori in fase di compilazione verso il
-pacchetto live-build, quelli di avvio verso live-boot e quelli in fase di
-esecuzione a live-config. Se non siete certi di quale sia il pacchetto
-appropriato o serve maggiore aiuto prima della segnalazione, inviate un
-messaggio in mailing list e vi aiuteremo a capire.
+In general, you should report build time errors against the live-build
+package, boot time errors against live-boot, and run time errors against
+live-config. If you are unsure of which package is appropriate or need more
+help before submitting a bug report, please report it against the
+debian-live pseudo-package. We will then take care about it and reassign it
+where appropriate.
Si noti che i bug trovati nelle distribuzioni derivate da Debian (come
Ubuntu e altre) *{non}* vanno segnalati a Debian BTS a meno che non siano
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index a0b7ab2..d55a745 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -231,6 +231,7 @@ archiviazione in modo da usare #{binary.hybrid.iso}# come dispositivo
CD/DVD, e avviare la macchina.
*{Nota:}* per sistemi live contenenti X.org che si vogliono provare con /{virtualbox-ose}/, si può voler includere il pacchetto dei driver per X.org di VirtualBox, /{virtualbox-ose-guest-x11}/, nella configurazione di live-build. In caso contrario la risoluzione è limitata a 800x600.
+
code{
$ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
@@ -250,6 +251,7 @@ sul supporto per altri scopi, come una partizione persistente, allora
occorre un'immagine HDD.
*{Nota:}* se si è creata un'immagine ISO ibrida con gli esempi precedenti, occorre pulire la directory di lavoro con il comando #{lb clean}# (vedere {Il comando lb clean}#lb-clean):
+
code{
# lb clean --binary
@@ -322,6 +324,7 @@ code{
}code
*{Nota:}* se si desidera utilizzare lo spazio extra con Windows pare che questo sistema operativo non possa accedere a nessuna partizione eccetto la prima. Alcune soluzioni a questo problema sono state discusse sulla nostra {mailing list}#contact, ma non sembrano esserci risposte semplici.
+
*{Ricorda: ogni volta che si installa un nuovo file binary.img sulla penna, tutti i dati sulla chiavetta saranno persi perché la tabella delle partizioni viene sovrascritta con i contenuti dell'immagine, per cui salvare prima la propria partizione extra in modo da ripristinarla dopo l'aggiornamento dell'immagine live.}*
2~building-netboot-image Creare un'immagine netboot
@@ -331,6 +334,7 @@ contenente il sistema Debian standard senza X.org. È adatta per il boot
tramite rete.
*{Nota:}* se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire la directory di lavoro con il comando #{lb clean}#:
+
code{
# lb clean --binary
@@ -369,7 +373,7 @@ di di livello superiore attraverso il protocollo TFTP. Questi potrebbe
essere pxelinux, GRUB, o anche avviare direttamente un sistema operativo
come Linux.
-Per esempio, estraendo l'archivio generato #{binary-net.tar.gz}# nella
+Per esempio, estraendo l'archivio generato #{binary.netboot.tar.xz}# nella
directory #{/srv/debian-live}#, si troverà l'immagine del filesystem in
#{live/filesystem.squashfs}# mentre il kernel, initrd ed il bootloader
pxelinux in #{tftpboot/debian-live/i386}#.
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index 37dc112..7c7767d 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -177,6 +177,7 @@ elenchi standard sui quali vi si basano altri. È inoltre possibile fornire i
propri elenchi o usare una combinazione di entrambi.
*{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
Il modo più semplice per usare gli elenchi è di specificarne uno o più con
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index a6649e9..ed6ca6c 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -45,23 +45,22 @@ code{
Un modo per cambiare la password è tramite un hook come descritto in {Hook
in fase di avvio}#boot-time-hooks. Si può usare l'hook "passwd" da
#{/usr/share/doc/live-config/examples/hooks}#, anteponendolo di conseguenza
-(ad esempio, 200-passwd) e aggiungerlo al file
+(ad esempio, 2000-passwd) e aggiungerlo al file
#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Personalizzare la localizzazione e la
lingua
-Quando il sistema live si avvia, la lingua è inserita in tre fasi:
+When the live system boots, language is involved in two steps:
_* generazione della localizzazione
-_* impostazione del layout di tastiera per la console
+_* setting the keyboard configuration
-impostazione del layout di tastiera per X
-
-Quando si crea un sistema live la localizzazione predefinita è
-"locales=en_US.UTF-8". Per definire quale generare, si usi il parametro
-#{locales}# nell'opzione #{--bootappend-live}# di #{lb config}#:
+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.
code{
@@ -69,26 +68,43 @@ code{
}code
-Questo parametro può inoltre essere usato dalla riga di comando del kernel,
-specificando una localizzazione nella forma #{lingua_nazione.codifica}#.
+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}#.
-Sia la configurazione della tastiera in console sia di X dipendono dal
-parametro #{keyboard-layouts}# dell'opzione #{--bootappend-live}#. Si
-possono trovare le opzioni valide per i layout di X in
-#{/usr/share/X11/xkb/rules/base.xml}# (piuttosto che limitate alle due
-lettere del codice della nazione); per trovare il valore (i due caratteri)
-corrispondenti alla lingua, si cerchi con il nome inglese della nazione in
-cui si parla tale lingua:
+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:
code{
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-Per ottenere i file di localizzazione per il layout di tastiera tedesco e
-svizzero-tedesco in X:
+Note that each variant lists the layout to which it applies in the
+description.
+
+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:
code{
@@ -96,28 +112,31 @@ code{
}code
-Si può ottenere un elenco di valori validi della tastiera per la console con
-il seguente comando:
+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:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live \
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
}code
-In alternativa è possibile utilizzare il pacchetto #{console-setup}#, uno
-strumento per configurare il layout della console tramite le definizioni di
-X (XKB); si può dunque impostare il layout in modo più preciso con le
-variabili #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# e
-#{keyboard-model}#; live-boot userà questi parametri anche per X. Ad
-esempio, per impostare un layout French-Dvorak (chiamato Bepo) su un sistema
-francese con una tastiera TypeMatrix, sia in console sia in X11:
+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:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "keyboard-layouts=us,us keyboard-variant=,dvorak"
}code
@@ -187,7 +206,7 @@ l'etichetta con una delle seguenti:
code{
- $ tune2fs -L persistence /dev/sdb1 # per filesystem ext2,3,4
+ # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
}code
@@ -219,10 +238,10 @@ persistente in un filesystem ext4 sulla partizione /dev/sdb1:
code{
- $ mkfs.ext4 -L persistence /dev/sdb1
- $ mount -t ext4 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live-persistence.conf
- $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
+ # mkfs.ext4 -L persistence /dev/sdb1
+ # mount -t ext4 /dev/sdb1 /mnt
+ # echo "/home" >> /mnt/live-persistence.conf
+ # echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
@@ -244,12 +263,12 @@ problematici se sono elencati nello stesso file #{live-persistence.conf}. Se
si ha davvero la necessità (in genere non si dovrebbe averla), consultare la
manpage di live-persistence.conf(5) per sapere come gestire questo caso.
-3~ Sottotesto persistente
+3~ Using more than one persistence store
-Se un utente avesse bisogno di archiviazioni multiple dello stesso tipo per
-differenti posti o per test, come #{persistence-casa}# e
-#{persistence-lavoro}#, il parametro d'avvio #{persistence-subtext}# usato
-in congiunzione con #{persistent}# permetterà supporti persistenti multipli
-ma univoci. Un esempio potrebbe essere un utente che vuole usare una
-partizione etichettata come #{persistence-sottotesto}#, userebbe:
-#{persistence}# #{persistence-subtext=sottotesto}#.
+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}#.
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index b8db715..6c365bd 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -125,7 +125,7 @@ configurazione}#managing-a-configuration.
code{
$ mkdir -p tutorial3/auto
- $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/
$ cd tutorial3
}code
@@ -144,6 +144,15 @@ code{
}code
+Perform #{lb config}# to generate the config tree, using the #{auto/config}#
+script you just created:
+
+code{
+
+ $ lb config
+
+}code
+
Popolare ora l'elenco locale dei pacchetti:
code{
diff --git a/manual/it/user_managing_a_configuration.ssi b/manual/it/user_managing_a_configuration.ssi
index 29d3d9d..acce0ce 100644
--- a/manual/it/user_managing_a_configuration.ssi
+++ b/manual/it/user_managing_a_configuration.ssi
@@ -84,7 +84,7 @@ precedenti; si possono copiare come punto di partenza.
code{
- $ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
}code
diff --git a/manual/po/ca/live-manual.ssm.po b/manual/po/ca/live-manual.ssm.po
index 60e91fd..ff68650 100644
--- a/manual/po/ca/live-manual.ssm.po
+++ b/manual/po/ca/live-manual.ssm.po
@@ -1,15 +1,18 @@
# Catalan translations for live-manual
# 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/>
# Carlos Zuferri <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-27 14:57+0300\n"
-"PO-Revision-Date: 2012-06-18 23:18+0200\n"
+"POT-Creation-Date: 2012-07-27 00:01+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"
-"Language: Catalan\n"
+"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -44,12 +47,13 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:13
+#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-06-27\n"
+" :published: 2012-07-27\n"
msgstr ""
"@date:\n"
-" :published: 2012-06-16"
+" :published: 2012-07-27\n"
#. type: Plain text
#: en/live-manual.ssm:15
@@ -70,7 +74,7 @@ msgstr ""
" :bold: /squeeze|wheezy|sid/\n"
" :italics: /live-boot|live-build|live-config|live-manual|live-installer|debian-installer-launcher/\n"
" :num_top: 1\n"
-" :skin: skin_debian-live"
+" :skin: skin_debian-live\n"
#. type: Plain text
#: en/live-manual.ssm:23
diff --git a/manual/po/ca/project_bugs.ssi.po b/manual/po/ca/project_bugs.ssi.po
index a843383..cbe68d4 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-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-07-21 03:48+0300\n"
"PO-Revision-Date: 2012-04-08 12:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -15,11 +15,10 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: 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: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
@@ -59,19 +58,19 @@ msgstr ""
#: 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: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
@@ -86,11 +85,10 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: 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: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
@@ -130,19 +128,19 @@ msgstr "code{"
#: 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: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
@@ -191,15 +189,15 @@ msgstr ""
#: en/project_bugs.ssi:12
msgid ""
"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
-"build, live-boot, and live-config before submitting a bug report."
+"build, live-boot, live-config and live-tools before submitting a bug report."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:14
msgid ""
"_* Try to give *{as specific information as possible}* about the bug. This "
-"includes (at least) the version of live-build, live-boot, and live-config "
-"used and the distribution of the live system you are building."
+"includes (at least) the version of live-build, live-boot, live-config, and "
+"live-tools used and the distribution of the live system you are building."
msgstr ""
#. type: Plain text
@@ -315,27 +313,32 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:50
+msgid "_* Version of live-tools on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
msgid ""
"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
msgid "_* Architecture of the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
msgid "_* Distribution of the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:56
+#: en/project_bugs.ssi:58
msgid "_* Version of the kernel on the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:58
+#: 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 "
@@ -343,20 +346,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:62
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:242
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:66
-msgid ""
-"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
-"live-boot.log}#)."
+#: en/project_bugs.ssi:68
+msgid "At boot time, live-boot stores a log in #{/var/log/live-boot.log}#."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
msgid ""
"Additionally, to rule out other errors, it is always a good idea to tar up "
"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
@@ -368,7 +370,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
msgid ""
"Remember to send in any logs that were produced with English locale "
"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -376,12 +378,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:74
msgid "2~ Isolate the failing case if possible"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:74
+#: 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 "
@@ -395,22 +397,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:78
msgid "2~ Use the correct package to report the bug against"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:78
-msgid "Where does the bug appear?"
+#: 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."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:82
+msgid ""
+"However, we would appreciate if you try to narrow it down according to where "
+"the bug appears."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
msgid "3~ At build time whilst bootstrapping"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:86
msgid ""
"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
@@ -420,7 +432,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:84
+#: 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 "
@@ -428,12 +440,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:90
msgid "3~ At build time whilst installing packages"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:92
msgid ""
"live-build installs additional packages from the Debian archive and "
"depending on the Debian distribution used and the daily archive state, it "
@@ -442,7 +454,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:94
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
"- please report it against the failing package. Running /{debootstrap}/ "
@@ -451,7 +463,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:92
+#: 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 "
@@ -459,12 +471,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:98
msgid "3~ At boot time"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:100
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
@@ -475,24 +487,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:102
msgid "3~ At run time"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:100
+#: 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,"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:106
msgid "2~ Do the research"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:108
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 "
@@ -502,7 +514,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:110
msgid ""
"You should pay particular attention to the Debian Live mailing list, as well "
"as the homepage, as these are likely to contain the most up-to-date "
@@ -511,20 +523,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:112
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, and live-config to see whether something similar has been reported "
-"already."
+"boot, live-config and live-tools to see whether something similar has been "
+"reported already."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:110
+#: en/project_bugs.ssi:114
msgid "2~ Where to report bugs"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:112
+#: en/project_bugs.ssi:116
msgid ""
"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
"System (BTS). For information on how to use the system, please see http://"
@@ -533,17 +545,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:114
+#: en/project_bugs.ssi:118
msgid ""
"In general, you should report build time errors against the live-build "
"package, boot time errors against live-boot, and run time errors against "
"live-config. If you are unsure of which package is appropriate or need more "
-"help before submitting a bug report, please send a message to the mailing "
-"list and we will help you to figure it out."
+"help before submitting a bug report, please report it against the debian-"
+"live pseudo-package. We will then take care about it and reassign it where "
+"appropriate."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:115
+#: en/project_bugs.ssi:119
msgid ""
"Please note that bugs found in distributions derived from Debian (such as "
"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/po/ca/user_basics.ssi.po b/manual/po/ca/user_basics.ssi.po
index 0c22c25..76b091a 100644
--- a/manual/po/ca/user_basics.ssi.po
+++ b/manual/po/ca/user_basics.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2012-06-24 17:14+0200\n"
"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -58,19 +58,19 @@ msgstr ""
#: 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: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_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_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
@@ -128,19 +128,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -336,7 +336,7 @@ msgstr ""
"«config/» en el directori actual per ser utilitzada per altres ordres:"
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -925,15 +925,15 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
-"Per exemple, si es descomprimeix el arxiu #{binary-net.tar.gz}# generat al "
-"directori #{/srv/debian-live}#, es trobarà la imatge del sistema de fitxers "
-"a #{live/filesystem.squashfs}# i el nucli, initrd i carregador d'arrencada "
-"pxelinux a #{tftpboot/debian-live/i386}#."
+"Per exemple, si es descomprimeix el arxiu #{binary.netboot.tar.xz}# generat "
+"al directori #{/srv/debian-live}#, es trobarà la imatge del sistema de "
+"fitxers a #{live/filesystem.squashfs}# i el nucli, initrd i carregador "
+"d'arrencada pxelinux a #{tftpboot/debian-live/i386}#."
#. type: Plain text
#: en/user_basics.ssi:246
diff --git a/manual/po/ca/user_customization-contents.ssi.po b/manual/po/ca/user_customization-contents.ssi.po
index 00fbf50..29326c9 100644
--- a/manual/po/ca/user_customization-contents.ssi.po
+++ b/manual/po/ca/user_customization-contents.ssi.po
@@ -1,19 +1,19 @@
-# Catalan translations for live-manual package
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Catalan translations for live-manual
# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-04-14 16:13+0300\n"
-"PO-Revision-Date: 2012-04-14 16:13+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2012-07-26 14:25+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\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"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -160,12 +160,12 @@ msgstr "}code"
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
msgid ":B~ Customizing contents"
-msgstr ""
+msgstr ":B~ Personalització dels continguts"
#. type: Plain text
#: en/user_customization-contents.ssi:4
msgid "1~customizing-contents Customizing contents"
-msgstr ""
+msgstr "1~customizing-contents Personalització dels continguts"
#. type: Plain text
#: en/user_customization-contents.ssi:6
@@ -177,11 +177,18 @@ msgid ""
"time, and preseeding allows you to configure packages when they are "
"installed by supplying answers to debconf questions."
msgstr ""
+"Aquest capítol tracta d'afinar la personalització dels continguts del "
+"sistema en viu més enllà de simplement triar els paquets que es desitja "
+"incloure. Els «includes» permeten afegir o reemplaçar fitxers arbitraris en "
+"la imatge Debian Live, els scripts ganxo (hooks) permeten executar ordres "
+"arbitràries en diferents etapes de la construcció i en el moment d'arrencar, "
+"i la preconfiguració permet configurar paquets quan s'instaŀlen mitjançant "
+"respostes a les preguntes de debconf ."
#. type: Plain text
#: en/user_customization-contents.ssi:8
msgid "2~includes Includes"
-msgstr ""
+msgstr "2~includes Includes"
#. type: Plain text
#: en/user_customization-contents.ssi:10
@@ -192,6 +199,11 @@ msgid ""
"replace) arbitrary files in your Debian Live image. live-build provides "
"three 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:"
#. type: Plain text
#: en/user_customization-contents.ssi:12
@@ -200,6 +212,9 @@ msgid ""
"chroot/Live filesystem. Please see {Live/chroot local includes}#live-chroot-"
"local-includes for more information."
msgstr ""
+"_* Chroot local includes: Aquests permeten afegir o substituir fitxers "
+"dintre de chroot/Live en el sistema de fitxers. Consultar {Live/chroot local "
+"includes}#live-chroot-local-includes per a més informació."
#. type: Plain text
#: en/user_customization-contents.ssi:14
@@ -208,6 +223,9 @@ msgid ""
"binary image. Please see {Binary local includes}#binary-local-includes for "
"more information."
msgstr ""
+"_* 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ó."
#. type: Plain text
#: en/user_customization-contents.ssi:16
@@ -216,6 +234,10 @@ msgid ""
"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
@@ -223,11 +245,13 @@ msgid ""
"Please see {Terms}#terms for more information about the distinction between "
"the \"Live\" and \"binary\" images."
msgstr ""
+"Consultar {Termes}#terms per a més informació sobre la distinció entre les "
+"imatges \"Live\" and \"binary\"."
#. type: Plain text
#: en/user_customization-contents.ssi:20
msgid "3~live-chroot-local-includes Live/chroot local includes"
-msgstr ""
+msgstr "3~live-chroot-local-includes Live/chroot local includes"
#. type: Plain text
#: en/user_customization-contents.ssi:22
@@ -240,6 +264,14 @@ msgid ""
"see {Live/chroot local hooks}#live-chroot-local-hooks if processing is "
"needed."
msgstr ""
+"Es poden utilitzar els chroot local includes per afegir o reemplaçar fitxers "
+"en el sistema de fitxers chroot/Live perquè puguin ser utilitzats en el "
+"sistema en viu. Un ús típic és per omplir l'esquelet de directori d'usuari (#"
+"{/etc/skel}#)utilitzat pel sistema en viu per crear el directori home de "
+"l'usuari en viu. Un altre és el de subministrar fitxers de configuració que "
+"poden ser simplement afegits o reemplaçats en la imatge sense processar; "
+"veure{Live/chroot local hooks}#live-chroot-local-hooks si es necessita "
+"processar-los."
#. type: Plain text
#: en/user_customization-contents.ssi:24
@@ -249,6 +281,10 @@ msgid ""
"live system. For example, to add a file #{/var/www/index.html}# in the live "
"system, use:"
msgstr ""
+"Per incloure fitxers, només s'han d'afegir al directori #{config/includes."
+"chroot}#. Aquest directori es correspon amb el directori arrel #{/}# del "
+"sistema en viu. Per exemple, per afegir un fitxer #{/var/www/index.html}# en "
+"el sistema en viu, fer:"
#. type: Plain text
#: en/user_customization-contents.ssi:29
@@ -257,11 +293,13 @@ 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
msgid "Your configuration will then have the following layout:"
-msgstr ""
+msgstr "La configuració tindrà llavors l'estructura següent:"
#. type: Plain text
#: en/user_customization-contents.ssi:44
@@ -276,6 +314,14 @@ 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
@@ -283,11 +329,13 @@ msgid ""
"Chroot local includes are installed after package installation so that files "
"installed by packages are overwritten."
msgstr ""
+"Els chroot local includes s'instaŀlen després de la instaŀlació del paquets "
+"de tal manera que es sobreescriuen els fitxers instaŀlats pels paquets."
#. type: Plain text
#: en/user_customization-contents.ssi:50
msgid "3~binary-local-includes Binary local includes"
-msgstr ""
+msgstr "3~binary-local-includes Binary local includes"
#. type: Plain text
#: en/user_customization-contents.ssi:52
@@ -300,22 +348,31 @@ msgid ""
"by an HTML index page. Simply copy the material to #{config/includes.binary/}"
"# as follows:"
msgstr ""
+"Per incloure material com documentació o vídeos en el sistema de fitxers "
+"dels medis de manera que sigui accessible immediatament després de la "
+"inserció dels medis sense haver de arrencar el sistema en viu, es pot "
+"utilitzar els binary local includes. Això funciona de manera similar als "
+"chroot local includes. Per exemple, si els fitxers #{~/video_demo.*}# són "
+"vídeos de demostració del sistema en viu descrits i lligats per una pàgina "
+"d'índex HTML. Només cal copiar el material a #{config/includes.binary/}# de "
+"la següent manera:"
#. type: Plain text
#: en/user_customization-contents.ssi:56
#, 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
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 ""
+msgstr "3~binary-includes Binary includes"
#. type: Plain text
#: en/user_customization-contents.ssi:64
@@ -323,12 +380,15 @@ 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 ""
+msgstr " $ lb config --includes none\n"
#. type: Plain text
#: en/user_customization-contents.ssi:72
@@ -337,11 +397,14 @@ msgid ""
"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
msgid "2~hooks Hooks"
-msgstr ""
+msgstr "2~hooks Scripts ganxo (Hooks)"
#. type: Plain text
#: en/user_customization-contents.ssi:76
@@ -349,11 +412,13 @@ msgid ""
"Hooks allow commands to be performed in the chroot and binary stages of the "
"build in order to customize the image."
msgstr ""
+"Els scripts ganxo permeten executar ordres en les etapes de la construcció "
+"chroot i binary per tal de personalitzar la imatge."
#. type: Plain text
#: en/user_customization-contents.ssi:78
msgid "3~live-chroot-local-hooks Live/chroot local hooks"
-msgstr ""
+msgstr "3~live-chroot-local-hooks Live/chroot local hooks"
#. type: Plain text
#: en/user_customization-contents.ssi:80
@@ -367,11 +432,19 @@ msgid ""
"build/examples/hooks}# which you can copy or symlink to use them in your own "
"configuration."
msgstr ""
+"Per executar ordres en l'etapa chroot, crear un script ganxo al directori #"
+"{config/hooks/}# amb el sufix #{.chroot}# que contingui les ordres. El ganxo "
+"s'executarà en el chroot després que la resta de la configuració del chroot "
+"s'hagi aplicat, assegurar-se que la configuració inclou tots els paquets i "
+"els fitxers que el ganxo necessita per funcionar. Veure els scripts chroot "
+"d'exemple per a diverses tasques comunes de personalització que es poden "
+"trovar a #{/usr/share/live/build/examples/hooks}# que es poden copiar o fer "
+"un enllaç simbòlic per utilitzar-los en la configuració pròpia."
#. type: Plain text
#: en/user_customization-contents.ssi:82
msgid "3~boot-time-hooks Boot-time hooks"
-msgstr ""
+msgstr "3~boot-time-hooks Scripts ganxo durant l'arrencada"
#. type: Plain text
#: en/user_customization-contents.ssi:84
@@ -384,11 +457,20 @@ msgid ""
"live/config/}#, or as a custom package as discussed in {Installing modified "
"or third-party packages}#installing-modified-or-third-party-packages."
msgstr ""
+"Per executar ordres durant l'arrencada, es pot proporcionar scripts ganxo "
+"live-config com s'explica a la secció \"Personalització\" de la seva pàgina "
+"de manual. Es poden proporcionar els ganxos de live-config a #{/lib/live/"
+"config/}#, tenint en compte la seqüència dels números. A continuació, "
+"proporcionar el script ganxo propi amb el prefix d'un número de seqüència "
+"apropiat, ja sigui com a un chroot local include a #{config/includes.chroot/"
+"lib/live/config/}#, o com un paquet personalitzat com es va discutir a "
+"{Instaŀlació de paquets modificats o de tercers}#installing-modified-or-"
+"third-party-packages."
#. type: Plain text
#: en/user_customization-contents.ssi:86
msgid "3~ Binary local hooks"
-msgstr ""
+msgstr "3~ Binary local hooks"
#. type: Plain text
#: en/user_customization-contents.ssi:88
@@ -403,11 +485,20 @@ msgid ""
"share/live/build/examples/hooks}# which you can copy or symlink to use them "
"in your own configuration."
msgstr ""
+"Per executar ordres a l'etapa binary, crear un script ganxo amb un sufix #{."
+"binary}# que contingui les ordres al directori #{config/hooks/}#. El ganxo "
+"s'executarà després que s'executin totes les ordres de la etapa binary però "
+"avans dels binary_checksums, la darrera ordre de la etapa binary. Les ordres "
+"del ganxo no s'executen al chroot, per tant tenir cura de no modificar cap "
+"fitxer de fora del arbre de construcció, o es pot fer malbé el sistema de "
+"creació! Veure els scripts ganxo de binary per a diverses tasques comunes de "
+"personalització a #{/usr/share/live/build/examples/hooks}# que es poden "
+"copiar o fer un enllaç simbòlic per utilitzar-los en la configuració pròpia."
#. type: Plain text
#: en/user_customization-contents.ssi:90
msgid "2~ Preseeding Debconf questions"
-msgstr ""
+msgstr "2~ Preconfiguració de les preguntes de Debconf"
#. type: Plain text
#: en/user_customization-contents.ssi:92
@@ -417,6 +508,10 @@ msgid ""
"debconf preseed files and are installed by live-build using #{debconf-set-"
"selections}# during the corresponding stage."
msgstr ""
+"Els fitxers del directory #{config/preseed/}# amb el sufix #{.preseed}# "
+"seguits del sufix de la etapa (#{.chroot}# o #{.binary}#) son considerats "
+"fitxers de preconfiguració de debconf i són instaŀlats per live-build "
+"utilitzant #{debconf-set-selections}# durant l'etapa corresponent."
#. type: Plain text
#: en/user_customization-contents.ssi:93
@@ -424,3 +519,5 @@ msgid ""
"For more information about debconf, please see #{debconf(7)}# in the /"
"{debconf}/ package."
msgstr ""
+"Per a més informació sobre debconf, veure #{debconf(7)}# del paquet /"
+"{debconf}/."
diff --git a/manual/po/ca/user_customization-overview.ssi.po b/manual/po/ca/user_customization-overview.ssi.po
index b99eea0..012eb7e 100644
--- a/manual/po/ca/user_customization-overview.ssi.po
+++ b/manual/po/ca/user_customization-overview.ssi.po
@@ -1,15 +1,14 @@
-# Catalan translations for live-manual package
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Catalan translations for live-manual
# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-04-14 16:13+0300\n"
-"PO-Revision-Date: 2012-04-14 16:13+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2012-07-13 13:39+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +17,12 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
msgid ":B~ Customizing contents"
-msgstr ""
+msgstr ":B~ Personalització dels continguts"
#. type: Plain text
#: en/user_customization-overview.ssi:4
msgid "1~customization-overview Customization overview"
-msgstr ""
+msgstr "1~customization-overview Personalització dels continguts"
#. type: Plain text
#: en/user_customization-overview.ssi:6
@@ -31,11 +30,13 @@ msgid ""
"This chapter gives an overview of the various ways in which you may "
"customize a Debian Live system."
msgstr ""
+"En aquest capítol s'ofereix una visió general de les diverses formes en què "
+"es pot personalitzar un sistema Debian Live."
#. type: Plain text
#: en/user_customization-overview.ssi:8
msgid "2~ Build time vs. boot time configuration"
-msgstr ""
+msgstr "2~ Configuració durant la construcció vs. durant l'arrencada"
#. type: Plain text
#: en/user_customization-overview.ssi:10
@@ -53,6 +54,21 @@ msgid ""
"system, such as persistence, keyboard layouts, or timezone. See {Customizing "
"locale and language}#customizing-locale-and-language, for example."
msgstr ""
+"La configuració de un sistema en viu es divideix en opcions en temps de "
+"constucció que són les opcions que s'apliquen durant la seva creació i les "
+"opcions d'arrencada del sistema que s'apliquen durant l'arrencada. Les "
+"opcions d'arrencada es divideixen en les què ocorren al principi de "
+"l'arrencada, aplicades pel paquet live-boot, i les que ocorren més tard en "
+"l'arrencada, aplicades per live-config. Qualsevol opció durant l'arrencada "
+"pot ser modificada per l'usuari, especificant-la a l'indicador d'arrencada. "
+"La imatge també pot ser construïda amb els paràmetres d'arrencada per "
+"defecte perquè els usuaris puguin simplement arrencar el sistema en viu "
+"sense especificar cap altra opció, ja que tots els valors per defecte són "
+"adequats. En particular, l'argument #{lb --bootappend-live}# consta de les "
+"opcions de línia d'ordres per defecte del nucli per al sistema en viu, com "
+"ara la persistència, la distribució del teclat o la zona horària. Veure "
+"{Personalització de l'entorn local i el llenguatge}#customizing-locale-and-"
+"language, per exemple."
#. type: Plain text
#: en/user_customization-overview.ssi:12
@@ -65,11 +81,19 @@ msgid ""
"your configuration. It is safe to do so, as none of the scripts contained "
"within them are executed unless the system is configured as a live system."
msgstr ""
+"Les opcions de configuració durant la construcció es descriuen a la pàgina "
+"del manual de #{lb config}#. Les opcions durant l'arrencada es descriuen a "
+"les pàgines del manual de live-boot i live-config. Malgrat que els paquets "
+"live-boot i live-config s'instaŀlen en el sistema en viu que s'està "
+"construint, és recomana instaŀlar-los en el sistema de construcció per a una "
+"referència fàcil quan s'està treballant en la configuració. És segur fer-ho, "
+"ja que cap dels scripts continguts en ells s'executen a menys que el sistema "
+"s'hagi configurat com a sistema viu."
#. type: Plain text
#: en/user_customization-overview.ssi:14
msgid "2~stages-of-the-build Stages of the build"
-msgstr ""
+msgstr "2~stages-of-the-build Etapes de la construcció"
#. type: Plain text
#: en/user_customization-overview.ssi:16
@@ -88,6 +112,21 @@ msgid ""
"filesystem. After the live image is built, if enabled, the source tarball is "
"built in the *{source}* stage."
msgstr ""
+"El procés de construcció es divideix en etapes, amb personalitzacions "
+"diferentes aplicades successivament en cada una. La primera etapa que "
+"s'executa es la fase *{bootstrap}*. Aquesta és la fase inicial de poblar el "
+"directori chroot amb paquets per fer un sistema Debian bàsic. Això és seguit "
+"per l'etapa *{chroot}*, que completa la construcció de directori chroot, "
+"omplint-lo amb tots els paquets que s'indiquen en la configuració, juntament "
+"amb qualsevol altre material. La majoria de personalitzacions dels "
+"continguts es produeix en aquesta etapa. L'etapa final de preparació de la "
+"imatge en viu és l'etapa *{binary}*, quan es construeix una imatge capaç "
+"d'arrencar, amb el contingut del directori chroot per construir el sistema "
+"de fitxers arrel per al sistema en viu, i que inclou el programa de "
+"instaŀlació i qualsevol altre material addicional en el medi de destinació "
+"fora del sistema de fitxers del sistema en viu. Després de construir la "
+"imatge en viu, si està habilitat, el codi font original s'inclou a l'etapa *"
+"{source}*."
#. type: Plain text
#: en/user_customization-overview.ssi:18
@@ -100,11 +139,18 @@ msgid ""
"patches are applied, and hooks are run later, after all of the materials are "
"in place."
msgstr ""
+"Dins de cadascuna d'aquestes etapes, hi ha una seqüència particular en la "
+"qual s'apliquen les ordres. Aquestes estan disposades de manera que es "
+"garanteixi que les personalitzacions es poden superposar de manera raonable. "
+"Per exemple, dins l'etapa chroot, les preconfiguracions (preseeds) "
+"s'apliquen abans que s'instaŀlin els paquets, els paquets s'instaŀlen abans "
+"que s'apliquin els fitxers locals o pegats inclosos, i els ganxos s'executen "
+"més tard, després que tots els materials estiguin al seu lloc."
#. type: Plain text
#: en/user_customization-overview.ssi:20
msgid "2~ Supplement lb config with files"
-msgstr ""
+msgstr "2~ Suplementar lb config amb fitxers "
#. type: Plain text
#: en/user_customization-overview.ssi:22
@@ -120,11 +166,22 @@ msgid ""
"boosting the already considerable flexibility of debian-live with code of "
"your own."
msgstr ""
+"Encara que #{lb config}# crea una configuració en esquelet al directori "
+"config/, per aconseguir els objectius, pot ser necessari proporcionar "
+"fitxers addicionals en els subdirectoris de config/. Depenent d'on "
+"s'emmagatzemen els fitxers en la configuració, poden ser copiats en el "
+"sistema d'fitxers del sistema en viu o en el sistema de fitxers de la imatge "
+"binària, o es pot proporcionar configuracions en temps de creació del "
+"sistema que serien engorroses de passar com opcions de línia d'ordres. Es "
+"pot incloure coses com ara llistes personalitzades de paquets, art "
+"personalitzat o scripts ganxo per funcionar ja sigui en temps de construcció "
+"o en temps d'arrencada, augmentant la flexibilitat ja considerable de debian-"
+"live amb codi propi."
#. type: Plain text
#: en/user_customization-overview.ssi:24
msgid "2~ Customization tasks"
-msgstr ""
+msgstr "2~ Tasques de personalització"
#. type: Plain text
#: en/user_customization-overview.ssi:25
@@ -135,3 +192,9 @@ msgid ""
"{Customizing locale and language}#customizing-locale-and-language cover just "
"a few of the things you might want to do."
msgstr ""
+"Els següents capítols s'organitzen pel tipus de tasques de personalització "
+"que els usuaris solen realitzar: {Personalització de la instaŀlació de "
+"paquets}#customizing-package-installation, {Personalització dels continguts}"
+"#customizing-contents i {Personalització de l'entorn local i el llenguatge}"
+"#customizing-locale-and-language cobreixen només algunes de les coses que es "
+"poden fer."
diff --git a/manual/po/ca/user_customization-packages.ssi.po b/manual/po/ca/user_customization-packages.ssi.po
index c6db1b4..12246a3 100644
--- a/manual/po/ca/user_customization-packages.ssi.po
+++ b/manual/po/ca/user_customization-packages.ssi.po
@@ -1,19 +1,19 @@
# Catalan translations for live-manual package
-# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-04-14 22:45+0300\n"
-"PO-Revision-Date: 2012-04-14 22:45+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2012-07-19 14:40+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: <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"
#. 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-packages.ssi:2
msgid ":B~ Customizing package installation"
-msgstr ""
+msgstr ":B~ Personalització de la instaŀlació de paquets"
#. type: Plain text
#: en/user_customization-packages.ssi:4
msgid "1~customizing-package-installation Customizing package installation"
msgstr ""
+"1~customizing-package-installation Personalització de la instaŀlació de "
+"paquets"
#. type: Plain text
#: en/user_customization-packages.ssi:6
@@ -184,16 +186,33 @@ msgid ""
"recommended packages to save space, or need to control which versions of "
"packages are installed via APT pinning, to name a few possibilities."
msgstr ""
+"La personalització més bàsica d'un sistema Debian viu pot ser la selecció "
+"dels paquets que seran inclosos en la imatge. Aquest capítol explica les "
+"diverses opcions de live-build per personalitzar la instaŀlació de paquets "
+"durant la construcció. Les opcions més importants que influeixen en els "
+"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."
#. type: Plain text
#: en/user_customization-packages.ssi:8
msgid "2~ Package sources"
-msgstr ""
+msgstr "2~ Fonts dels paquets"
#. type: Plain text
#: en/user_customization-packages.ssi:10
msgid "3~ Distribution, archive areas and mode"
-msgstr ""
+msgstr "3~ Distribució, zones d'arxiu i mode "
#. type: Plain text
#: en/user_customization-packages.ssi:12
@@ -208,6 +227,15 @@ msgid ""
"distribution. For example, to build against the *{unstable}* release, sid, "
"specify:"
msgstr ""
+"La distribució que es tria té una gran importància en els paquets que estan "
+"disponibles per incloure en una imatge en viu. Només cal especificar el nom "
+"en clau, que per defecte és wheezy per a la versió wheezy de live-build. "
+"Qualsevol distribució disponible a l'arxiu de Debian pot ser especificada "
+"pel seu nom en clau aquí. (Veure {Termes}#terms per més detalls.) L'opció #"
+"{--distribution}# no només influeix en l'origen dels paquets dins l'arxiu, "
+"sinó que també instrueix a live-build per comportar-se segons sigui "
+"necessari per a construir cada distribució compatible. Per exemple, per "
+"construir la distribució *{unstable}*, sid, s'ha d'especificar:"
#. type: Plain text
#: en/user_customization-packages.ssi:16
@@ -223,6 +251,11 @@ msgid ""
"{main}# contains software that is part of the Debian distribution, hence "
"that is the default. One or more values may be specified, e.g."
msgstr ""
+"A l'arxiu de la distribució, les àrees d'arxiu són les divisions principals "
+"de l'arxiu. A Debian, es tracta de #{main}#, #{contrib}# i #{non-free}#. "
+"Només #{main}# conté el programari que és part de la distribució Debian, pel "
+"que és el valor per defecte. Un o més valors es poden especificar, per "
+"exemple:"
#. type: Plain text
#: en/user_customization-packages.ssi:24
@@ -240,17 +273,24 @@ msgid ""
"derivative are supported instead of the ones for Debian. The mode also "
"modifies live-build behaviour to suit the derivatives."
msgstr ""
+"És dona suport experimental a alguns derivats de Debian a través de l'opció #"
+"{--mode}#. Per defecte, aquesta opció està establerta en #{debian}#, tot i "
+"que se estigui construint en un sistema que no sigui Debian. Si s'especifica "
+"#{--mode ubuntu}# o #{--mode emdebian}#, s'utilitzen els noms de distribució "
+"i les àrees dels arxius dels derivats especificats en lloc dels de Debian. "
+"El «mode» també modifica el comportament de live-build per adaptar-lo als "
+"derivats."
#. type: Plain text
#: en/user_customization-packages.ssi:30
#, no-wrap
msgid "*{Note:}* The projects for whom these modes were added are primarily responsible for supporting users of these options. The Debian live project, in turn, provides development support on a best-effort basis only, based on feedback from the derivative projects as we do not develop or support these derivatives ourselves.\n"
-msgstr ""
+msgstr "*{Nota:}* Els projectes per als quals aquests modes s'han afegit són els principals responsables de donar suport als usuaris d'aquestes opcions. El projecte Debian Live, al seu torn, dona suport de desenvolupament només sobre una base de millor esforç, basada en les informacions proporcionades pels projectes derivats ja que nosaltres no desenvolupem ni donem suport a aquests derivats.\n"
#. type: Plain text
#: en/user_customization-packages.ssi:32
msgid "3~ Distribution mirrors"
-msgstr ""
+msgstr "3~ Miralls de distribució"
#. type: Plain text
#: en/user_customization-packages.ssi:34
@@ -267,12 +307,26 @@ msgid ""
"mirror-binary}# and #{--mirror-binary-security}# values are used, "
"superceding any mirrors used in an earlier stage."
msgstr ""
+"L'arxiu de Debian es replica a través d'una àmplia xarxa de miralls a tot el "
+"món perquè la gent en cada regió pugui triar un mirall proper amb la millor "
+"velocitat de descàrrega. Cadascuna de les opcions #{--mirror-*}# governa "
+"quin mirall de distribució s'utilitzara en les diverses etapes de la "
+"construcció. Recordar de {Etapes de la construcció}#stages-of-the-build que "
+"l'etapa *{bootstrap}* es quan el chroot s'omple inicialment per /"
+"{debootstrap}/ amb un sistema mínim i l'etapa *{chroot}* és quan s'utilitza "
+"el chroot per a la construcció de sistema d'fitxers del sistema en viu. "
+"D'aquesta manera, s'utilitzan els miralls corresponents per a aquestes "
+"etapes, i més tard, durant l'etapa *{binary}* s'utilitzan els valors #{--"
+"mirror-binary}# i #{--mirror-binary-security}# substituint qualsevol mirall "
+"utilitzat en una etapa anterior."
#. type: Plain text
#: en/user_customization-packages.ssi:36
msgid ""
"3~distribution-mirrors-build-time Distribution mirrors used at build time"
msgstr ""
+"3~distribution-mirrors-build-time Miralls de distribució utilitzats en temps "
+"de construcció"
#. type: Plain text
#: en/user_customization-packages.ssi:38
@@ -281,6 +335,10 @@ msgid ""
"mirror, it is sufficient to set #{--mirror-bootstrap}#, #{--mirror-chroot-"
"security}# and #{--mirror-chroot-backports}# as follows."
msgstr ""
+"Per establir els miralls de la distrubució utilitzats en temps de "
+"construcció perquè apuntin a una rèplica local, és suficient establir #{--"
+"mirror-bootstrap}#, #{--mirror-chroot-security}# i #{--mirror-chroot-"
+"backports}# de la manera següent."
#. type: Plain text
#: en/user_customization-packages.ssi:44
@@ -297,11 +355,13 @@ msgid ""
"The chroot mirror, specified by #{--mirror-chroot}#, defaults to the #{--"
"mirror-bootstrap}# value."
msgstr ""
+"El mirall per al chroot, especificat per l'opció #{--mirror-chroot}#, per "
+"defecte pren el mateix valor que #{--mirror-bootstrap}#"
#. type: Plain text
#: en/user_customization-packages.ssi:50
msgid "3~ Distribution mirrors used at run time"
-msgstr ""
+msgstr "3~ Miralls de distribució utilitzats en temps d'execució"
#. type: Plain text
#: en/user_customization-packages.ssi:52
@@ -315,6 +375,15 @@ msgid ""
"example below. An image built from this configuration would only be suitable "
"for users on a network where \"#{mirror}#\" is reachable."
msgstr ""
+"Les opcions #{--mirror-binary*}# governen els miralls de distribució "
+"coŀlocats a la imatge binària. Aquestes poden ser utilitzades per instaŀlar "
+"paquets addicionals mentre s'executa el sistema en viu. Els valors per "
+"defecte utilitzan #{cdn.debian.net}#, un servei que tria un mirall "
+"geogràficament a prop en funció del número IP de l'usuari. Aquesta és una "
+"opció adequada quan no es pot predir quin serà el millor mirall per tots els "
+"usuaris. O es pot especificar els valors propis com es mostra en l'exemple "
+"següent. Una imatge construïda a partir d'aquesta configuració només seria "
+"convenient per als usuaris en una xarxa on \"#{mirror}#\" és abastable."
#. type: Plain text
#: en/user_customization-packages.ssi:57
@@ -327,7 +396,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:61
msgid "3~additional-repositories Additional repositories"
-msgstr ""
+msgstr "3~additional-repositories Repositoris addicionals"
#. type: Plain text
#: en/user_customization-packages.ssi:63
@@ -341,6 +410,15 @@ msgid ""
"stage when building the image, and in the *{binary}* stage, i.e. for use "
"when running the live system."
msgstr ""
+"És possible afegir més repositoris, ampliant les opcions de paquets més "
+"enllà dels disponibles en la pròpia distribució de destinació. Aquests poden "
+"ser, per exemple, per backports, experimentals o paquets personalitzats. Per "
+"configurar repositoris addicionals, crear els fitxers #{config/archives/your-"
+"repository.list.chroot}#, i/o #{config/archives/your-repository.list.binary}"
+"#. Igual que amb les opcions #{--mirror-*}# aquest regeix els repositoris "
+"utilitzats en l'étapa *{chroot}* durant la construcció de la imatge, i a "
+"l'étapa *{binary}*, és a dir, per ser utilitzades quan s'executa el sistema "
+"en viu."
#. type: Plain text
#: en/user_customization-packages.ssi:65
@@ -348,6 +426,9 @@ msgid ""
"For example, #{config/archives/live.list.chroot}# allows you to install "
"packages from the debian live snapshot repository at live system build time."
msgstr ""
+"Per exemple, #{config/archives/live.list.chroot}# permet d'instaŀlar paquets "
+"des del repositori de instantànies de debian live en el moment de creació "
+"del sistema viu."
#. type: Plain text
#: en/user_customization-packages.ssi:69
@@ -362,11 +443,14 @@ msgid ""
"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
"directory."
msgstr ""
+"Si s'afegeix la mateixa línia a #{config/archives/live.list.binary}#, el "
+"repositori sera afegit al directori #{/etc/apt/sources.list.d/}# del sistema "
+"viu."
#. type: Plain text
#: en/user_customization-packages.ssi:75
msgid "If such files exist, they will be picked up automatically."
-msgstr ""
+msgstr "Si aquests fitxers existeixen, seran utilitzats de forma automàtica."
#. type: Plain text
#: en/user_customization-packages.ssi:77
@@ -374,12 +458,14 @@ msgid ""
"You should also put the GPG key used to sign the repository into #{config/"
"archives/your-repository.key.{binary,chroot}}# files."
msgstr ""
+"També s'ha de posar la clau GPG utilitzada per signar el repositori en "
+"fitxers #{config/archives/your-repository.key.{binary,chroot}}#."
#. type: Plain text
#: en/user_customization-packages.ssi:79
#, no-wrap
msgid "*{Note:}* some preconfigured package repositories are available for easy selection through the #{--archives}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:\n"
-msgstr ""
+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
@@ -390,7 +476,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:87
msgid "2~choosing-packages-to-install Choosing packages to install"
-msgstr ""
+msgstr "2~choosing-packages-to-install Selecció dels paquets a instaŀlar"
#. type: Plain text
#: en/user_customization-packages.ssi:89
@@ -402,11 +488,19 @@ msgid ""
"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."
#. type: Plain text
#: en/user_customization-packages.ssi:91
msgid "3~package-lists Package lists"
-msgstr ""
+msgstr "3~package-lists Llistes de paquets"
#. type: Plain text
#: en/user_customization-packages.ssi:93
@@ -420,17 +514,26 @@ msgid ""
"others are based upon. You can also provide your own package lists, or use a "
"combination of both."
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."
#. type: Plain text
#: en/user_customization-packages.ssi:95
#, no-wrap
msgid "*{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.\n"
-msgstr ""
+msgstr "*{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.\n"
#. type: Plain text
#: en/user_customization-packages.ssi:97
msgid "3~ Predefined package lists"
-msgstr ""
+msgstr "3~ Llistes predefinides de paquets"
#. type: Plain text
#: en/user_customization-packages.ssi:99
@@ -438,6 +541,8 @@ msgid ""
"The simplest way to use lists is to specify one or more predefined lists "
"with the #{--package-lists}# option. 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:"
#. type: Plain text
#: en/user_customization-packages.ssi:103
@@ -453,11 +558,15 @@ msgid ""
"corresponding file, paying attention to included files and conditionals as "
"described in the following sections."
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."
#. type: Plain text
#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
-msgstr ""
+msgstr "3~ Llistes locals de paquets"
#. type: Plain text
#: en/user_customization-packages.ssi:111
@@ -465,6 +574,8 @@ msgid ""
"You may supplement the predefined lists using local package lists stored in #"
"{config/package-lists/}#."
msgstr ""
+"Es poden completar les llistes predefinides mitjançant les llistes locals de "
+"paquets emmagatzemades a #{config/package-lists/}#."
#. type: Plain text
#: en/user_customization-packages.ssi:113
@@ -473,17 +584,21 @@ msgid ""
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
"or #{.binary}# to indicate which stage the list is for."
msgstr ""
+"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 "
+"adicional #{.chroot}# o #{.binary}# per indicar per a quina etapa és la "
+"llista."
#. type: Plain text
#: en/user_customization-packages.ssi:115
#, 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 ""
+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
msgid "3~ Local binary package lists"
-msgstr ""
+msgstr "3~ Llistes locals de paquets per l'etapa binary"
#. type: Plain text
#: en/user_customization-packages.ssi:119
@@ -495,11 +610,18 @@ msgid ""
"mentioned above, if you want this list to be the same as your chroot stage "
"list, simply use the #{.list}# suffix by itself."
msgstr ""
+"Per crear una llista per a l'etapa binary, crear un fitxer amb el sufix #{."
+"list.binary}# a #{config/package-lists/}#. Aquests paquets no s'instaŀlan al "
+"sistema de fitxers en viu però s'inclouen en els medis en viu a #{pool/}#. "
+"Un ús típic d'aquesta llista seria amb una de les variants del 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}#."
#. type: Plain text
#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
-msgstr ""
+msgstr "3~ Ampliació d'una llista mitjançant includes"
#. type: Plain text
#: en/user_customization-packages.ssi:123
@@ -508,6 +630,10 @@ msgid ""
"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."
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."
#. type: Plain text
#: en/user_customization-packages.ssi:125
@@ -516,6 +642,9 @@ msgid ""
"plus /{iceweasel}/, create #{config/package-lists/my.list.chroot}# 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:"
#. type: Plain text
#: en/user_customization-packages.ssi:130
@@ -528,7 +657,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
-msgstr ""
+msgstr "3~ Ús de condicionals dins de les llistes de paquets"
#. type: Plain text
#: en/user_customization-packages.ssi:136
@@ -540,6 +669,13 @@ msgid ""
"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
"# or #{ARCHIVE_AREAS}#."
msgstr ""
+"Qualsevol de les variables de configuració de live-build emmagatzemades a #"
+"{config/*}# (menys el prefix #{LB_}#) poden ser utilitzades en sentències "
+"condicionals en les llistes de paquets. En general, això significa qualsevol "
+"opció #{lb config}# en lletres majuscules i amb guions canviats a guions "
+"baixos. Però a la pràctica, només tenen sentit les que influeixen en la "
+"selecció de paquets, com ara #{DISTRIBUTION}#, #{ARCHITECTURES}# o #"
+"{ARCHIVE_AREAS}#."
#. type: Plain text
#: en/user_customization-packages.ssi:138
@@ -547,6 +683,8 @@ msgid ""
"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
"specified:"
msgstr ""
+"Per exemple, per instaŀlar #{ia32-libs}# si s'especifica #{--architectures "
+"amd64}#:"
#. type: Plain text
#: en/user_customization-packages.ssi:144
@@ -564,6 +702,9 @@ msgid ""
"{memtest86+}/ if either #{--architectures i386}# or #{--architectures amd64}"
"# is specified:"
msgstr ""
+"És possible fer un test d'un qualsevol d'un nombre de valors, per exemple "
+"per instaŀlar /{memtest86+}/ si s'especifica #{--architectures i386}# o #{--"
+"architectures amd64}#:"
#. type: Plain text
#: en/user_customization-packages.ssi:154
@@ -581,6 +722,9 @@ msgid ""
"g. to install /{vrms}/ if either #{contrib}# or #{non-free}# is specified "
"via #{--archive-areas}#:"
msgstr ""
+"També es pot provar amb variables que poden contenir més d'un valor, per "
+"exemple, per instaŀlar /{vrms}/ si s'especifica o #{contrib}# o #{non-free}# "
+"a través de l'opció #{--archive-areas}#:"
#. type: Plain text
#: en/user_customization-packages.ssi:164
@@ -594,7 +738,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
-msgstr ""
+msgstr "Un condicional pot envoltar una directiva #{#include}#:"
#. type: Plain text
#: en/user_customization-packages.ssi:174
@@ -608,12 +752,12 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
-msgstr ""
+msgstr "No és possible el anidament dels condicionals."
#. type: Plain text
#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
-msgstr ""
+msgstr "3~ Tasques"
#. type: Plain text
#: en/user_customization-packages.ssi:182
@@ -626,6 +770,13 @@ msgid ""
"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
@@ -643,11 +794,15 @@ msgid ""
"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
msgid "3~desktop-and-language-tasks Desktop and language tasks"
-msgstr ""
+msgstr "3~desktop-and-language-tasks Tasques d'escriptori i llenguatge"
#. type: Plain text
#: en/user_customization-packages.ssi:195
@@ -662,6 +817,17 @@ msgid ""
"for languages, but the user's language choice during the install influences "
"the selection of corresponding language tasks."
msgstr ""
+"Les tasques d'escriptori i el llenguatge són casos especials que necessiten "
+"una mica de planificació i configuració extra. Les imatges en viu són "
+"diferentes de les imatges de l'instaŀlador de Debian en aquest sentit. A "
+"l'instaŀlador de Debian, si el medi es va preparar per obtenir un tipus "
+"entorn d'escriptori en particular, la tasca corresponent s'instaŀlarà "
+"automàticament. Per tant hi ha tasques internes #{gnome-desktop}#, #{kde-"
+"desktop}#, #{lxde-desktop}# and #{xfce-desktop}# cap de les quals "
+"s'ofereixen al menú de #{tasksel}#. De la mateixa manera, no hi ha cap "
+"entrada de menú per a les tasques de les llengües, però l'elecció del idioma "
+"de l'usuari durant la instaŀlació influeix en la selecció de les tasques de "
+"llengües corresponents."
#. type: Plain text
#: en/user_customization-packages.ssi:197
@@ -673,6 +839,13 @@ msgid ""
"multiple desktops or multiple languages and offer the user a choice, but "
"that is not live-build's default behaviour."
msgstr ""
+"En el desenvolupament d'una imatge en viu d'escriptori, la imatge sol "
+"arrencar directament a un escriptori de treball, les opcions d'escriptori i "
+"de llengua han estat fetes en temps de construcció, no en temps d'execució "
+"com en el cas del instaŀlador de Debian. Això no vol dir que una imatge en "
+"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."
#. type: Plain text
#: en/user_customization-packages.ssi:199
@@ -683,6 +856,11 @@ msgid ""
"a GNOME desktop image containing support for Japanese might include these "
"tasks:"
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 "
+"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:"
#. type: Plain text
#: en/user_customization-packages.ssi:205
@@ -701,6 +879,11 @@ msgid ""
"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
@@ -716,6 +899,8 @@ 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
@@ -723,6 +908,8 @@ msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
+"2~installing-modified-or-third-party-packages Instaŀlació de paquets "
+"modificats o de tercers"
#. type: Plain text
#: en/user_customization-packages.ssi:222
@@ -734,6 +921,13 @@ msgid ""
"packages that are undesirable. Similarly, \"third-party\" packages may be "
"used to add bespoke and/or proprietary functionality."
msgstr ""
+"Si bé està en contra de la filosofia de Debian Live, de vegades pot ser "
+"necessària la construcció d'un sistema en viu amb versions modificades dels "
+"paquets que es troben al arxiu de Debian. Pot ser per modificar or donar "
+"suport a funcions addicionals, les llengües o les marques, o fins i tot per "
+"eliminar elements dels paquets existents que són indesitjables. De la "
+"mateixa manera, es poden utilitzar paquets de tercers per afegir alguna "
+"funcionalitat personalitzada i/o propietària."
#. type: Plain text
#: en/user_customization-packages.ssi:224
@@ -745,11 +939,17 @@ msgid ""
"the Debian New Maintainers' Guide at http://www.debian.org/doc/maint-guide/ "
"and elsewhere."
msgstr ""
+"Aquesta secció no cobreix l'assessorament en matèria de construcció o "
+"manteniment de paquets modificats. Però el métode de Joachim Breitner's 'How "
+"to fork privately' a http://www.joachim-breitner.de/blog/archives/282-How-to-"
+"fork-privately.html pot ser d'interès. La creació de paquets personalitzats "
+"es tracta a Debian New Maintainers' Guide at http://www.debian.org/doc/maint-"
+"guide/ i en altres llocs."
#. type: Plain text
#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
-msgstr ""
+msgstr "Hi ha dues formes d'instaŀlar paquets personalitzats modificats:"
#. type: Plain text
#: en/user_customization-packages.ssi:228
@@ -759,7 +959,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
-msgstr ""
+msgstr "_* L'ús d'un repositori APT personalitzat"
#. type: Plain text
#: en/user_customization-packages.ssi:232
@@ -768,11 +968,15 @@ msgid ""
"customizations but has a number of drawbacks, whilst using a custom APT "
"repository is more time-consuming to set up."
msgstr ""
+"Utilitzar #{packages.chroot}# és més fàcil d'aconseguir i útil per a "
+"personalitzacions \"ràpides\", però té una sèrie d'inconvenients, mentre que "
+"l'ús d'un repositori APT personalitzat és més costós en la quantitat de "
+"temps necessari."
#. type: Plain text
#: en/user_customization-packages.ssi:234
msgid "3~ Using #{packages.chroot}# to install custom packages"
-msgstr ""
+msgstr "3~ Fer servir #{packages.chroot}# per instaŀar paquets personalitzats"
#. type: Plain text
#: en/user_customization-packages.ssi:236
@@ -782,6 +986,10 @@ msgid ""
"installed into the live system during build - you do not need to specify "
"them elsewhere."
msgstr ""
+"Per instaŀar un paquet personalitzat, només s'ha de copiar al directori #"
+"{config/packages.chroot/}#. Els paquets que es troben dins d'aquest "
+"directori s'instaŀlaran automàticament en el sistema en viu durant la "
+"construcció - no cal especificar res més en cap altre lloc."
#. type: Plain text
#: en/user_customization-packages.ssi:238
@@ -789,6 +997,8 @@ msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
+"Els paquets *{han de}* ser nomenats en la forma prescrita. Una manera simple "
+"de fer això és utilitzar #{dpkg-name}#."
#. type: Plain text
#: en/user_customization-packages.ssi:240
@@ -796,11 +1006,13 @@ msgid ""
"Using #{packages.chroot}# for installation of custom packages has "
"disadvantages:"
msgstr ""
+"Utilitzar #{packages.chroot}# per a la instaŀlació de paquets personalitzats "
+"té els seus desavantatges:"
#. type: Plain text
#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
-msgstr ""
+msgstr "_* No és possible utilitzar APT segur."
#. type: Plain text
#: en/user_customization-packages.ssi:244
@@ -808,6 +1020,8 @@ msgid ""
"_* You must install all appropriate packages in the #{config/packages."
"chroot/}# directory."
msgstr ""
+"_* Cal posar tots els paquets apropiats al directori #{config/packages."
+"chroot/}#."
#. type: Plain text
#: en/user_customization-packages.ssi:246
@@ -815,11 +1029,13 @@ msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
+"_* No es presta per a l'emmagatzematge de configuracions de Debian Live en "
+"el control de revisió."
#. type: Plain text
#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
-msgstr ""
+msgstr "3~ Fer servir un repositori APT per instaŀlar paquets personalitzats"
#. type: Plain text
#: en/user_customization-packages.ssi:250
@@ -828,6 +1044,10 @@ msgid ""
"must ensure that you specify the packages elsewhere. See {Choosing packages "
"to install}#choosing-packages-to-install for details."
msgstr ""
+"A diferència de #{packages.chroot}#, quan s'utilitza un repositori APT "
+"personalitzat s'ha d'assegurar que s'especifiquen els paquets en un altre "
+"lloc. Veure {Selecció dels paquets a instaŀlar}#choosing-packages-to-install "
+"per més detalls."
#. type: Plain text
#: en/user_customization-packages.ssi:252
@@ -836,11 +1056,15 @@ msgid ""
"custom packages, the infrastructure can be easily re-used at a later date to "
"offer updates of the modified packages."
msgstr ""
+"Si bé crear un repositori APT per instaŀlar paquets personalitzats pot "
+"semblar un esforç innecessari, la infraestructura pot ser fàcilment "
+"reutilitzada en una data posterior per oferir actualitzacions dels paquets "
+"modificats."
#. type: Plain text
#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
-msgstr ""
+msgstr "3~ Paquets personalitzats i APT"
#. type: Plain text
#: en/user_customization-packages.ssi:256
@@ -851,6 +1075,11 @@ msgid ""
"different repositories with different version numbers, APT will elect to "
"install the package with the higher version number."
msgstr ""
+"live-build utilitza APT per instaŀlar tots els paquets al sistema en viu per "
+"tant, heretarà els comportaments d'aquest programa. Un exemple rellevant és "
+"que (assumint una configuració per defecte) si es dóna el cas que un paquet "
+"està disponible en dos repositoris diferents, amb diferents números de "
+"versió, APT triarà per instaŀlar el paquet amb la versió més alta."
#. type: Plain text
#: en/user_customization-packages.ssi:258
@@ -861,11 +1090,17 @@ msgid ""
"achieved by altering the live system's APT pinning preferences - see {APT "
"pinning}#apt-pinning for more information."
msgstr ""
+"A causa d'això, s'aconsella augmentar el nombre de versió dels paquets "
+"personalitzats als fixers #{debian/changelog}# per assegurar-se que la "
+"versió modificada és la que s'instaŀla en lloc d'una dels repositoris "
+"oficials de Debian. Això també es pot aconseguir mitjançant l'alteració de "
+"les preferències d'APT del sistema en viu - veure {APT pinning}#apt-pinning "
+"per més informació."
#. type: Plain text
#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
-msgstr ""
+msgstr "2~ Configurar APT en temps de construcció"
#. type: Plain text
#: en/user_customization-packages.ssi:262
@@ -877,11 +1112,17 @@ msgid ""
"complete list, look for options starting with #{apt}# in the #{lb_config}# "
"man page."
msgstr ""
+"Es pot configurar APT a través d'una sèrie d'opcions que només s'apliquen en "
+"temps de construcció. (La configuració d'APT al sistema en funcionament en "
+"viu es pot fer de forma normal per als continguts del sistema en viu, és a "
+"dir, mitjançant la inclusió de les configuracions adequades a través de #"
+"{config/includes.chroot/}#.) Per obtenir una llista completa, buscar les "
+"opcions que comencen amb #{apt}# a la pàgina del manual de #{lb_config}#."
#. type: Plain text
#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
-msgstr ""
+msgstr "3~choosing-apt-or-aptitude Seleccionar apt o aptitude"
#. type: Plain text
#: en/user_customization-packages.ssi:266
@@ -892,6 +1133,11 @@ msgid ""
"package installation, the notable difference being how missing packages are "
"handled."
msgstr ""
+"Es pot optar per utilitzar /{apt}/ o /{aptitude}/ a l'hora d'instaŀlar "
+"paquets en temps de construcció. Quina utilitat s'usa es configura gràcies "
+"al argument #{--apt}# de #{lb config}#. Escollir el mètode d'implementació "
+"per al comportament preferit durant la instaŀlació de paquets, la diferència "
+"notable és la forma en que es manegen els paquets que falten."
#. type: Plain text
#: en/user_customization-packages.ssi:268
@@ -899,6 +1145,8 @@ msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
+"_* #{apt}#: Amb aquest mètode, si un paquet que s'especifica falta, "
+"l'instaŀlació de paquets fallarà. Aquesta és la configuració per defecte."
#. type: Plain text
#: en/user_customization-packages.ssi:270
@@ -906,11 +1154,13 @@ msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
+"_* #{aptitude}#: Amb aquest mètode, si s'especifica un paquet que falta, "
+"l'instaŀlació de paquets tindrà èxit."
#. type: Plain text
#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
-msgstr ""
+msgstr "3~ L'ús d'un proxy amb APT"
#. type: Plain text
#: en/user_customization-packages.ssi:274
@@ -919,6 +1169,9 @@ msgid ""
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
"or #{--apt-http-proxy}# options as needed, e.g."
msgstr ""
+"Una configuració típica d'APT és per fer front a la construcció d'una imatge "
+"darrere d'un proxy. Es pot especificar el proxy per APT amb les opcions #{--"
+"apt-ftp-proxy}# o #{--apt-http-proxy}# segons sigui necessari, per exemple,"
#. type: Plain text
#: en/user_customization-packages.ssi:278
@@ -929,7 +1182,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
-msgstr ""
+msgstr "3~ Afinar APT per estalviar espai"
#. type: Plain text
#: en/user_customization-packages.ssi:284
@@ -938,6 +1191,8 @@ msgid ""
"which case one or the other or both of the following options may be of "
"interest."
msgstr ""
+"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 d'interès."
#. type: Plain text
#: en/user_customization-packages.ssi:286
@@ -945,6 +1200,7 @@ msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
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
@@ -961,6 +1217,12 @@ msgid ""
"before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
"the user must #{apt-get update}# first to create those indices."
msgstr ""
+"Això no influirà en les entrades de #{/etc/apt/sources.list}#, sinó "
+"simplement si #{/var/lib/apt}# conté els fitxers dels índexs o no. El "
+"desavantatge és que APT necessita aquests índexs per tal d'operar en el "
+"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."
#. type: Plain text
#: en/user_customization-packages.ssi:296
@@ -968,6 +1230,8 @@ msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, 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
@@ -990,11 +1254,23 @@ msgid ""
"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 "
+"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."
#. type: Plain text
#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
-msgstr ""
+msgstr "3~ Passar opcions per a apt o aptitude"
#. type: Plain text
#: en/user_customization-packages.ssi:308
@@ -1004,11 +1280,15 @@ msgid ""
"options through to your configured APT tool. See the man pages for #{apt}# "
"and #{aptitude}# for details."
msgstr ""
+"Si no hi ha una opció #{lb config}# per modificar el comportament d'APT tal "
+"i com es necessita, utilitzar #{--apt-options}# o #{--aptitude-options}# per "
+"passar alguna opció a través de l'eina APT configurada. Consultar les "
+"pàgines del manual de #{apt}# i #{aptitude}# per a més detalls."
#. type: Plain text
#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
-msgstr ""
+msgstr "3~apt-pinning APT pinning"
#. type: Plain text
#: en/user_customization-packages.ssi:312
@@ -1018,6 +1298,10 @@ msgid ""
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
"#{config/includes.chroot/etc/apt/preferences}#."
msgstr ""
+"Com a referència, llegir primer la pàgina del manual #{apt_preferences(5)}#. "
+"Es pot configurar APT pinning tant pel temps de construcció, o bé per temps "
+"d'execució. En el primer cas, crear #{config/chroot_apt/preferences}#. Per "
+"aquest últim cas, crear #{config/includes.chroot/etc/apt/preferences}#."
#. type: Plain text
#: en/user_customization-packages.ssi:314
@@ -1029,6 +1313,12 @@ msgid ""
"taken from the target system distribution, wheezy. The following will "
"accomplish this:"
msgstr ""
+"Suposem que s'està construint un sistema en viu wheezy però es necessita que "
+"tots els paquets en viu que acaben en la imatge binària s'instaŀlin desde "
+"sid en temps de construcció. Cal afegir sid a les fonts d'APT i fer un pin "
+"de manera que només els paquets que es vol s'instaŀlin en el moment de la "
+"construcció i tots els altres es preguin de la distribució de destinació, "
+"wheezy. El que segueix aconseguira això:"
#. type: Plain text
#: en/user_customization-packages.ssi:322
@@ -1055,7 +1345,7 @@ msgstr ""
#: en/user_customization-packages.ssi:331
#, 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 ""
+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
@@ -1074,6 +1364,14 @@ msgid ""
"{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}#:"
#. type: Plain text
#: en/user_customization-packages.ssi:345
diff --git a/manual/po/ca/user_customization-runtime.ssi.po b/manual/po/ca/user_customization-runtime.ssi.po
index b5b7eb5..1ddeaec 100644
--- a/manual/po/ca/user_customization-runtime.ssi.po
+++ b/manual/po/ca/user_customization-runtime.ssi.po
@@ -1,25 +1,25 @@
# Catalan translations for live-manual package
-# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-09 20:31+0300\n"
-"PO-Revision-Date: 2012-06-09 20:31+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2012-07-21 03:48+0300\n"
+"PO-Revision-Date: 2012-07-20 21:51+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: <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"
#. 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
@@ -59,19 +59,19 @@ msgstr ""
#: 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-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
@@ -89,7 +89,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
@@ -129,19 +129,19 @@ msgstr "code{"
#: 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-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
@@ -234,7 +234,7 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"prefix it accordingly (e.g. 2000-passwd) and add it to #{config/includes."
"chroot/lib/live/config/}#"
msgstr ""
@@ -245,7 +245,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
#. type: Plain text
@@ -255,108 +255,130 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
+msgid "_* setting the keyboard configuration"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:45
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"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}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:55
msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation 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-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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:72
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
+#: en/user_customization-runtime.ssi:74
+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 ""
+
+#. 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 ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:82
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+" $ lb config --bootappend-live \\\n"
+" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:91
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, 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-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 ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:96
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:100
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:102
msgid ""
"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 "
@@ -364,7 +386,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:104
msgid ""
"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 "
@@ -373,7 +395,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:106
msgid ""
"'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 "
@@ -384,7 +406,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:108
msgid ""
"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 "
@@ -394,7 +416,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:110
msgid ""
"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 "
@@ -404,17 +426,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:112
msgid "_* a partition, identified by its GPT name."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:114
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:116
msgid ""
"_* 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 "
@@ -423,7 +445,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:118
msgid ""
"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-"
@@ -432,7 +454,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:120
msgid ""
"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 "
@@ -440,38 +462,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:124
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:138
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -479,17 +501,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:147
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:149
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -498,7 +520,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:153
msgid ""
"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 "
@@ -507,17 +529,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ 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"
+" # 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:164
msgid ""
"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 "
@@ -529,7 +551,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:166
msgid ""
"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 "
@@ -542,18 +564,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
-msgid "3~ Persistence SubText"
+#: en/user_customization-runtime.ssi:168
+msgid "3~ Using more than one persistence store"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:169
msgid ""
-"If a user would need multiple persistence storage of the same type for "
+"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-subtext}# used in "
+"{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-subtext=subText}#."
+"boot parameters of: #{persistence}# #{persistence-label=subText}#."
msgstr ""
diff --git a/manual/po/ca/user_examples.ssi.po b/manual/po/ca/user_examples.ssi.po
index b88aa94..7c61658 100644
--- a/manual/po/ca/user_examples.ssi.po
+++ b/manual/po/ca/user_examples.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-07 08:43+0300\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"
"Language-Team: none\n"
@@ -63,19 +63,19 @@ msgstr ":B~ Exemples"
#: 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: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_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_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
@@ -133,19 +133,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -161,14 +161,20 @@ msgstr "}code"
#. type: Plain text
#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:242
#, 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
+#, 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:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -369,7 +375,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
-" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/\n"
" $ cd tutorial3\n"
msgstr ""
@@ -391,17 +397,24 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:105
+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
msgid "Now populate your local package list:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:109
+#: en/user_examples.ssi:117
#, no-wrap
msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:121
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 #"
@@ -412,19 +425,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:115
+#: en/user_examples.ssi:123
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:131
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:125
+#: en/user_examples.ssi:133
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 "
@@ -432,7 +445,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:139
#, no-wrap
msgid ""
" $ git init\n"
@@ -441,19 +454,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:135
+#: en/user_examples.ssi:143
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:137
+#: en/user_examples.ssi:145
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:139
+#: en/user_examples.ssi:147
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 "
@@ -462,47 +475,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:151
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:155
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:151
+#: en/user_examples.ssi:159
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:163
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:167
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:171
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:175
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:179
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -513,7 +526,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:173
+#: en/user_examples.ssi:181
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 "
@@ -523,18 +536,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:183
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:177
+#: en/user_examples.ssi:185
#, 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:179
+#: en/user_examples.ssi:187
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
@@ -542,7 +555,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:195
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
@@ -553,7 +566,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:191
+#: en/user_examples.ssi:199
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
@@ -561,7 +574,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:205
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -570,7 +583,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:208
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -578,7 +591,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:211
#, no-wrap
msgid ""
" exit\n"
@@ -586,28 +599,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:215
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:223
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:217
+#: en/user_examples.ssi:225
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:219
+#: 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"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:221
+#: en/user_examples.ssi:229
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 "
@@ -621,7 +634,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:234
#, no-wrap
msgid ""
" $ lb config -k 486 -p minimal --apt-indices false \\\n"
@@ -629,12 +642,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:230
+#: en/user_examples.ssi:238
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:246
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 "
@@ -642,7 +655,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:248
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 "
@@ -660,18 +673,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:250
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:252
#, 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:246
+#: en/user_examples.ssi:254
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 "
@@ -679,7 +692,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:256
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 "
@@ -689,18 +702,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:260
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:264
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:269
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -708,14 +721,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:273
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:271
+#: en/user_examples.ssi:279
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -724,7 +737,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:275
+#: en/user_examples.ssi:283
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, "
@@ -734,7 +747,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:289
+#: en/user_examples.ssi:297
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -751,7 +764,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:292
+#: en/user_examples.ssi:300
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_managing_a_configuration.ssi.po b/manual/po/ca/user_managing_a_configuration.ssi.po
index 9fccadf..64d7eb2 100644
--- a/manual/po/ca/user_managing_a_configuration.ssi.po
+++ b/manual/po/ca/user_managing_a_configuration.ssi.po
@@ -1,26 +1,25 @@
-# Catalan translations for live-manual package
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Catalan translations for live-manual
# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
-"PO-Revision-Date: 2012-04-14 16:13+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2012-07-19 03:36+0300\n"
+"PO-Revision-Date: 2012-07-08 18:02+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: <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"
#. 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:60
#: 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
@@ -60,19 +59,19 @@ msgstr ""
#: 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: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_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_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
@@ -90,8 +89,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:64
#: 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
@@ -131,19 +129,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -160,12 +158,12 @@ msgstr "}code"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:2
msgid ":B~ Managing a configuration"
-msgstr ""
+msgstr ":B~ Gestió d'una configuració"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:4
msgid "1~managing-a-configuration Managing a configuration"
-msgstr ""
+msgstr "1~managing-a-configuration Gestió d'una configuració"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:6
@@ -174,11 +172,14 @@ msgid ""
"creation, through successive revisions and successive releases of both the "
"live-build software and the live image itself."
msgstr ""
+"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."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:8
msgid "2~ Use auto to manage configuration changes"
-msgstr ""
+msgstr "2~ Utilitzar auto per gestionar canvis de configuració"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:10
@@ -190,6 +191,13 @@ msgid ""
"default value, that value will not be recomputed from other variables that "
"may change in later revisions."
msgstr ""
+"Les configuracions dels sistemes vius poques vegades són perfectes al primer "
+"intent. És probable que s'hagi de fer una sèrie de revisions fins quedar "
+"satisfet. No obstant això, es poden introduir inconsistències a la "
+"configuració d'una versió a la següent si no se'n te cura. El principal "
+"problema és, que una vegada que a una variable se li assigna un valor per "
+"defecte, aquest valor no es torna a calcular a partir d'altres variables que "
+"poden canviar en revisions posteriors."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:12
@@ -199,6 +207,11 @@ msgid ""
"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."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:14
@@ -209,6 +222,11 @@ msgid ""
"{config/*}# files, which you will then need to use to set the appropriate "
"option again."
msgstr ""
+"Un segon problema relacionat és que si s'executa #{lb config}# i després "
+"s'actualitza a una versió nova de live-build que ha canviat un dels noms de "
+"les variables, només es descobrirà això mitjantçant una revisió manual de "
+"les variables als fitxers de #{config/*}# que després s'hauran de tornar a "
+"modificar per establir l'opció corresponent de nou."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:16
@@ -224,11 +242,22 @@ msgid ""
"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)."
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 )."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:18
msgid "2~ Example auto scripts"
-msgstr ""
+msgstr "2~ Scripts auto d'exemple"
#. type: Plain text
#: en/user_managing_a_configuration.ssi:20
@@ -240,6 +269,12 @@ msgid ""
"Also, don't forget to ensure the scripts are executable (e.g. #{chmod 755 "
"auto/*}#)."
msgstr ""
+"Es poden utilitzar scripts auto d'exemple com ara els següents com a punt de "
+"partida per crear una nova configuració de live-build. Tenir en compte que "
+"quan s'invoca l'ordre #{lb}# que embolcalla el script auto, s'ha "
+"d'especificar #{noauto}# com a paràmetre per garantir que el script auto no "
+"es torna a executar de forma recursiva. A més, assegurar-se que els scripts "
+"són fitxers executables (e.g. #{chmod 755 auto/*}#)."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:22
@@ -291,11 +326,13 @@ msgid ""
"We now ship example auto scripts with live-build based on the examples "
"above. You may copy those as your starting point."
msgstr ""
+"Ara incloem scripts auto d'exemple amb live-build basats en els exemples "
+"anteriors. Es poden copiar com a punt de partida."
#. type: Plain text
#: en/user_managing_a_configuration.ssi:58
#, no-wrap
-msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
+msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
@@ -307,3 +344,8 @@ msgid ""
"to use the default) and add any additional options in continuation lines "
"that follow."
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ó."
diff --git a/manual/po/ca/user_overview.ssi.po b/manual/po/ca/user_overview.ssi.po
index 27a5175..e1dea32 100644
--- a/manual/po/ca/user_overview.ssi.po
+++ b/manual/po/ca/user_overview.ssi.po
@@ -1,19 +1,19 @@
-# Catalan translations for live-manual package
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Catalan translations for live-manual
# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2012.
+# Carlos Zuferri <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
+"Project-Id-Version: live-manual\n"
"POT-Creation-Date: 2012-06-16 18:50+0300\n"
-"PO-Revision-Date: 2012-06-16 18:50+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ca\n"
+"PO-Revision-Date: 2012-06-28 15:12+0200\n"
+"Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
+"Language: Catalan\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -158,12 +158,12 @@ msgstr "}code"
#. type: Plain text
#: en/user_overview.ssi:2
msgid ":B~ Overview of tools"
-msgstr ""
+msgstr ":B~ Descripció general de les eines"
#. type: Plain text
#: en/user_overview.ssi:4
msgid "1~overview-of-tools Overview of tools"
-msgstr ""
+msgstr "1~overview-of-tools Descripció general de les eines"
#. type: Plain text
#: en/user_overview.ssi:6
@@ -171,11 +171,13 @@ msgid ""
"This chapter contains an overview of the three main tools used in building "
"Debian Live systems: live-build, live-boot and live-config."
msgstr ""
+"Aquest capítol conté un resum de les tres eines principals utilitzades en la "
+"construcció dels sistemes Debian Live: live-build, live-boot i live-config."
#. type: Plain text
#: en/user_overview.ssi:8
msgid "2~live-build The live-build package"
-msgstr ""
+msgstr "2~live-build El paquet live-build"
#. type: Plain text
#: en/user_overview.ssi:10
@@ -183,6 +185,8 @@ msgid ""
"live-build is a collection of scripts to build Debian Live systems. These "
"scripts are also referred to as \"commands\"."
msgstr ""
+"live-build és un conjunt de scripts per crear sistemes Debian Live. Aquests "
+"scripts també s'anomenen «ordres»."
#. type: Plain text
#: en/user_overview.ssi:12
@@ -191,6 +195,9 @@ msgid ""
"directory to completely automate and customize all aspects of building a "
"Live image."
msgstr ""
+"La idea darrere de live-build és ser un marc que utilitza un directori de "
+"configuració per automatitzar completament i personalitzar tots els aspectes "
+"de la construcció d'una imatge en viu."
#. type: Plain text
#: en/user_overview.ssi:14
@@ -198,6 +205,8 @@ msgid ""
"Many concepts are similar to those in the /{debhelper}/ Debian package tools "
"written by Joey Hess:"
msgstr ""
+"Molts conceptes són similars als de les eines del paquet Debian /"
+"{debhelper}/ escrit per Joey Hess:"
#. type: Plain text
#: en/user_overview.ssi:16
@@ -209,6 +218,12 @@ msgid ""
"package. In much the same way, live-build stores its configuration entirely "
"under a #{config/}# subdirectory."
msgstr ""
+"_* Els scripts tenen una ubicació central per a la configuració del seu "
+"funcionament. Amb /{debhelper}/ aquest és el subdirectori #{debian/}# d'un "
+"arbre de paquets. Per exemple, dh_install buscarà, entre altres, un arxiu "
+"anomenat #{debian/install}# per determinar quins fitxers han d'existir en un "
+"paquet binari en particular. De la mateixa manera, live-build emmagatzema la "
+"seva configuració per complet sota un subdirectori #{config/}#."
#. type: Plain text
#: en/user_overview.ssi:18
@@ -216,6 +231,8 @@ msgid ""
"_* The scripts are independent - that is to say, it is always safe to run "
"each command."
msgstr ""
+"_* Els scripts són independents - és a dir, sempre és segur executar cada "
+"ordre."
#. type: Plain text
#: en/user_overview.ssi:20
@@ -225,12 +242,16 @@ msgid ""
"similar to tools such as /{dh-make}/. For more information about #{lb config}"
"#, please see {The lb config command}#lb-config."
msgstr ""
+"A diferència de /{debhelper}/, live-build conté una eina per generar un "
+"directori de configuració en esquelet, #{lb config}#. Això podria ser "
+"considerat similar a eines com ara /{dh-make}/. Per obtenir més informació "
+"sobre #{lb config}#, veure {L'ordre lb config}#lb-config."
#. type: Plain text
#: en/user_overview.ssi:22
msgid ""
"The remainder of this section discusses the three most important commands:"
-msgstr ""
+msgstr "La resta d'aquesta secció descriu les tres ordres més importants:"
#. type: Plain text
#: en/user_overview.ssi:24
@@ -238,6 +259,8 @@ msgid ""
"_* *{lb config}*: Responsible for initializing a Live system configuration "
"directory. See {The lb config command}#lb-config for more information."
msgstr ""
+"_* *{lb config}*: Responsable de crear un directori de configuració per al "
+"sistema en viu. Consultar {L'ordre lb config}#lb-config per a més informació."
#. type: Plain text
#: en/user_overview.ssi:26
@@ -245,6 +268,8 @@ msgid ""
"_* *{lb build}*: Responsible for starting a Live system build. See {The lb "
"build command}#lb-build for more information."
msgstr ""
+"_* *{lb build}*: Responsable d'iniciar la creació d'un sistema en viu. "
+"Consultar {L'ordre lb build}#lb-build per a més informació."
#. type: Plain text
#: en/user_overview.ssi:28
@@ -252,11 +277,13 @@ msgid ""
"_* *{lb clean}*: Responsible for removing parts of a Live system build. See "
"{The lb clean command}#lb-clean for more information."
msgstr ""
+"_* *{lb clean}*: Responsable d'eliminar parts de la construcció d'un sistema "
+"viu. Consultar {L'ordre lb clean}#lb-clean per a més informació."
#. type: Plain text
#: en/user_overview.ssi:30
msgid "3~lb-config The #{lb config}# command"
-msgstr ""
+msgstr "3~lb-config L'ordre #{lb config}#"
#. type: Plain text
#: en/user_overview.ssi:32
@@ -267,6 +294,11 @@ msgid ""
"consuming and error-prone, the #{lb config}# command can be used to create "
"skeleton configuration folders."
msgstr ""
+"Com s'ha dit a {live-build}#live-build, les seqüències d'ordres que formen "
+"part de live-build llegeixen la seva configuració amb l'ordre #{source}# "
+"d'un únic directori anomenat #{config/}#. Com la construcció d'aquest "
+"directori a mà, seria molt costós i propens a errors, es pot utilitzar "
+"l'ordre #{lb config}# per crear carpetes de configuració en esquelet."
#. type: Plain text
#: en/user_overview.ssi:34
@@ -275,6 +307,9 @@ msgid ""
"subdirectory which it populates with some default settings, and a skeleton #"
"{auto/}# subdirectory tree."
msgstr ""
+"Executar #{lb config}# sense arguments crea un subdirectori #{config/}# que "
+"s'omple amb alguns paràmetres per defecte, i un arbre en esquelet de "
+"subdirectoris #{auto/}#."
#. type: Plain text
#: en/user_overview.ssi:41
@@ -294,6 +329,11 @@ msgid ""
"configuration via #{auto/config}# (see {Managing a configuration}#managing-a-"
"configuration for details)."
msgstr ""
+"Utilitzar #{lb config}# sense cap tipus d'arguments seria convenient per als "
+"usuaris que necessiten una imatge molt bàsica, o que tinguin la intenció de "
+"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)."
#. type: Plain text
#: en/user_overview.ssi:47
@@ -301,6 +341,8 @@ 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
@@ -311,7 +353,7 @@ msgstr ""
#. type: Plain text
#: en/user_overview.ssi:55
msgid "It is possible to specify many options, such as:"
-msgstr ""
+msgstr "És possible especificar diverses opcions, com ara:"
#. type: Plain text
#: en/user_overview.ssi:59
@@ -323,11 +365,13 @@ msgstr ""
#: en/user_overview.ssi:63
msgid "A full list of options is available in the #{lb_config}# man page."
msgstr ""
+"Una llista completa d'opcions està disponible a la pàgina del manual #"
+"{lb_config}#."
#. type: Plain text
#: en/user_overview.ssi:65
msgid "3~lb-build The #{lb build}# command"
-msgstr ""
+msgstr "3~lb-build L'ordre #{lb build}#"
#. type: Plain text
#: en/user_overview.ssi:67
@@ -336,11 +380,14 @@ msgid ""
"directory. It then runs the lower level commands needed to build your Live "
"system."
msgstr ""
+"L'ordre #{lb build}# llegeix la configuració del directori #{config/}#. A "
+"continuació, executa les ordres de nivell inferior necessaries per construir "
+"el sistema en viu."
#. type: Plain text
#: en/user_overview.ssi:69
msgid "3~lb-clean The #{lb clean}# command"
-msgstr ""
+msgstr "3~lb-clean L'ordre #{lb clean}#"
#. type: Plain text
#: en/user_overview.ssi:71
@@ -353,11 +400,18 @@ msgid ""
"to building a new binary. See the #{lb_clean}# man page for a full list of "
"options."
msgstr ""
+"L'ordre #{lb clean}# s'encarrega d'eliminar diverses parts d'una construcció "
+"per que altres construccions posteriors puguin començar des d'un estat net. "
+"Per defecte, es netegen les etapes #{chroot}#, #{binary}# i #{source}#, però "
+"la memòria cau es manté intacta. A més, es poden netejar etapes individuals. "
+"Per exemple, si s'han fet canvis que només afecten a la fase binary, "
+"utilitzar #{lb clean --binary}# abans de construir un nou binary. Veure la "
+"pàgina del manual de #{lb_clean}# per a una llista completa d'opcions."
#. type: Plain text
#: en/user_overview.ssi:73
msgid "2~live-boot The live-boot package"
-msgstr ""
+msgstr "2~live-boot El paquet live-boot"
#. type: Plain text
#: en/user_overview.ssi:75
@@ -367,6 +421,10 @@ msgid ""
"as those created by live-build. This includes the Debian Live ISOs, netboot "
"tarballs, and USB stick images."
msgstr ""
+"live-boot és un conjunt de scripts per proporcionar hooks a initramfs-tools, "
+"que s'utilitzen per generar un initramfs capaç d'arrencar sistemes vius, com "
+"ara els creats per live-build. Això inclou les ISOs de Debian Live, netboot "
+"tarballs i imatges per a memòries USB."
#. type: Plain text
#: en/user_overview.ssi:77
@@ -376,6 +434,11 @@ msgid ""
"squashfs) is stored. If found, it will create a writable environment, using "
"aufs, for Debian like systems to boot from."
msgstr ""
+"En el moment d'arrencar, buscarà medis de només lectura que continguin un "
+"directori #{/live/}# on s'emmagatzema un sistema de fitxers arrel (sovint "
+"una imatge de un sistema de fitxers comprimit squashfs). Si el troba, crearà "
+"un entorn d'escriptura, utilitzant aufs, per que puguin arrencar sistemes "
+"com Debian o similars."
#. type: Plain text
#: en/user_overview.ssi:79
@@ -384,11 +447,14 @@ msgid ""
"Kernel Handbook at http://kernel-handbook.alioth.debian.org/ in the chapter "
"on initramfs."
msgstr ""
+"Més informació sobre ramfs inicial a Debian es pot trobar al Debian Linux "
+"Kernel Handbook http://kernel-handbook.alioth.debian.org/ al capítol sobre "
+"initramfs."
#. type: Plain text
#: en/user_overview.ssi:81
msgid "2~live-config The live-config package"
-msgstr ""
+msgstr "2~live-config El paquet live-config"
#. type: Plain text
#: en/user_overview.ssi:82
@@ -398,3 +464,8 @@ msgid ""
"the hostname, locales and timezone, creating the live user, inhibiting cron "
"jobs and performing autologin of the live user."
msgstr ""
+"live-config consta dels scripts que s'executen durant l'arrencada després de "
+"live-boot per a configurar el sistema en viu de forma automàtica. S'ocupa de "
+"tasques com ara l'establiment de les locales, el nom d'amfitrió, i la zona "
+"horària, crear l'usuari en viu, l'inhibició de tasques de cron i l'inici "
+"automàtic de sessió per l'usuari en viu."
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 6f5281f..9195139 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -78,7 +78,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:12
msgid "2~ For the impatient"
-msgstr "Für die Ungeduldigen"
+msgstr "2~ Für die Ungeduldigen"
#. type: Plain text
#: en/about_manual.ssi:14
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index bea151d..8af25b6 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -1,11 +1,14 @@
# German translations for live-manual package
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2011.
+# This po file is part of the live-manual package created by the:
+# Debian Live Project
+# <http://live.debian.net/>
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-27 14:57+0300\n"
+"POT-Creation-Date: 2012-07-27 00:01+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -39,17 +42,18 @@ msgid ""
" :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.\n"
msgstr ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2012 Debian Live Projekt\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :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.\n"
#. type: Plain text
#: en/live-manual.ssm:13
+#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-06-27\n"
+" :published: 2012-07-27\n"
msgstr ""
"@date:\n"
-" :published: 27.06.2012\n"
+" :published: 27.07.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/de/project_bugs.ssi.po b/manual/po/de/project_bugs.ssi.po
index 593b7da..abe8540 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-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-07-21 03:48+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,11 +16,10 @@ msgstr ""
"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
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: 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: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
@@ -60,19 +59,19 @@ msgstr ""
#: 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: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
@@ -87,11 +86,10 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: 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: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
@@ -131,19 +129,19 @@ msgstr ""
#: 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: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
@@ -192,15 +190,15 @@ msgstr ""
#: en/project_bugs.ssi:12
msgid ""
"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
-"build, live-boot, and live-config before submitting a bug report."
+"build, live-boot, live-config and live-tools before submitting a bug report."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:14
msgid ""
"_* Try to give *{as specific information as possible}* about the bug. This "
-"includes (at least) the version of live-build, live-boot, and live-config "
-"used and the distribution of the live system you are building."
+"includes (at least) the version of live-build, live-boot, live-config, and "
+"live-tools used and the distribution of the live system you are building."
msgstr ""
#. type: Plain text
@@ -316,27 +314,32 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:50
+msgid "_* Version of live-tools on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
msgid ""
"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
msgid "_* Architecture of the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
msgid "_* Distribution of the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:56
+#: en/project_bugs.ssi:58
msgid "_* Version of the kernel on the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:58
+#: 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 "
@@ -344,20 +347,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:62
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:242
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:66
-msgid ""
-"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
-"live-boot.log}#)."
+#: en/project_bugs.ssi:68
+msgid "At boot time, live-boot stores a log in #{/var/log/live-boot.log}#."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
msgid ""
"Additionally, to rule out other errors, it is always a good idea to tar up "
"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
@@ -369,7 +371,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
msgid ""
"Remember to send in any logs that were produced with English locale "
"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -377,12 +379,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:74
msgid "2~ Isolate the failing case if possible"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:74
+#: 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 "
@@ -396,22 +398,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:78
msgid "2~ Use the correct package to report the bug against"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:78
-msgid "Where does the bug appear?"
+#: 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."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:82
+msgid ""
+"However, we would appreciate if you try to narrow it down according to where "
+"the bug appears."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
msgid "3~ At build time whilst bootstrapping"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:86
msgid ""
"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
@@ -421,7 +433,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:84
+#: 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 "
@@ -429,12 +441,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:90
msgid "3~ At build time whilst installing packages"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:92
msgid ""
"live-build installs additional packages from the Debian archive and "
"depending on the Debian distribution used and the daily archive state, it "
@@ -443,7 +455,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:94
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
"- please report it against the failing package. Running /{debootstrap}/ "
@@ -452,7 +464,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:92
+#: 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 "
@@ -460,12 +472,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:98
msgid "3~ At boot time"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:100
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
@@ -476,24 +488,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:102
msgid "3~ At run time"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:100
+#: 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,"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:106
msgid "2~ Do the research"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:108
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 "
@@ -503,7 +515,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:110
msgid ""
"You should pay particular attention to the Debian Live mailing list, as well "
"as the homepage, as these are likely to contain the most up-to-date "
@@ -512,20 +524,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:112
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, and live-config to see whether something similar has been reported "
-"already."
+"boot, live-config and live-tools to see whether something similar has been "
+"reported already."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:110
+#: en/project_bugs.ssi:114
msgid "2~ Where to report bugs"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:112
+#: en/project_bugs.ssi:116
msgid ""
"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
"System (BTS). For information on how to use the system, please see http://"
@@ -534,17 +546,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:114
+#: en/project_bugs.ssi:118
msgid ""
"In general, you should report build time errors against the live-build "
"package, boot time errors against live-boot, and run time errors against "
"live-config. If you are unsure of which package is appropriate or need more "
-"help before submitting a bug report, please send a message to the mailing "
-"list and we will help you to figure it out."
+"help before submitting a bug report, please report it against the debian-"
+"live pseudo-package. We will then take care about it and reassign it where "
+"appropriate."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:115
+#: en/project_bugs.ssi:119
msgid ""
"Please note that bugs found in distributions derived from Debian (such as "
"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 3009492..4dce9ec 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -59,19 +59,19 @@ msgstr ""
#: 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: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_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_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
@@ -129,19 +129,19 @@ msgstr ""
#: 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: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_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_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
@@ -280,7 +280,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -302,7 +302,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -749,8 +749,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
diff --git a/manual/po/de/user_customization-runtime.ssi.po b/manual/po/de/user_customization-runtime.ssi.po
index 8d2d7b4..a7b7a22 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-06-09 20:31+0300\n"
+"POT-Creation-Date: 2012-07-21 03: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
@@ -59,19 +59,19 @@ msgstr ""
#: 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-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
@@ -89,7 +89,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
@@ -129,19 +129,19 @@ msgstr ""
#: 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-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
@@ -234,7 +234,7 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"prefix it accordingly (e.g. 2000-passwd) and add it to #{config/includes."
"chroot/lib/live/config/}#"
msgstr ""
@@ -245,7 +245,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
#. type: Plain text
@@ -255,108 +255,130 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
+msgid "_* setting the keyboard configuration"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:45
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"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}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:55
msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation 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-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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:72
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
+#: en/user_customization-runtime.ssi:74
+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 ""
+
+#. 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 ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:82
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+" $ lb config --bootappend-live \\\n"
+" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:91
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, 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-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 ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:96
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:100
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:102
msgid ""
"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 "
@@ -364,7 +386,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:104
msgid ""
"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 "
@@ -373,7 +395,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:106
msgid ""
"'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 "
@@ -384,7 +406,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:108
msgid ""
"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 "
@@ -394,7 +416,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:110
msgid ""
"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 "
@@ -404,17 +426,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:112
msgid "_* a partition, identified by its GPT name."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:114
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:116
msgid ""
"_* 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 "
@@ -423,7 +445,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:118
msgid ""
"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-"
@@ -432,7 +454,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:120
msgid ""
"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 "
@@ -440,38 +462,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:124
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:138
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -479,17 +501,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:147
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:149
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -498,7 +520,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:153
msgid ""
"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 "
@@ -507,17 +529,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ 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"
+" # 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:164
msgid ""
"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 "
@@ -529,7 +551,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:166
msgid ""
"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 "
@@ -542,18 +564,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
-msgid "3~ Persistence SubText"
+#: en/user_customization-runtime.ssi:168
+msgid "3~ Using more than one persistence store"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:169
msgid ""
-"If a user would need multiple persistence storage of the same type for "
+"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-subtext}# used in "
+"{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-subtext=subText}#."
+"boot parameters of: #{persistence}# #{persistence-label=subText}#."
msgstr ""
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 75e23b1..0ef6493 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-06-07 08:43+0300\n"
+"POT-Creation-Date: 2012-07-19 03:36+0300\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -64,19 +64,19 @@ msgstr ":B~ Beispiele"
#: 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: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_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_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
@@ -134,19 +134,19 @@ msgstr ""
#: 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: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_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_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
@@ -162,14 +162,20 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:242
#, 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
+#, 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:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -370,7 +376,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
-" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/\n"
" $ cd tutorial3\n"
msgstr ""
@@ -392,17 +398,24 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:105
+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
msgid "Now populate your local package list:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:109
+#: en/user_examples.ssi:117
#, no-wrap
msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:121
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 #"
@@ -413,19 +426,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:115
+#: en/user_examples.ssi:123
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:131
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:125
+#: en/user_examples.ssi:133
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 "
@@ -433,7 +446,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:139
#, no-wrap
msgid ""
" $ git init\n"
@@ -442,19 +455,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:135
+#: en/user_examples.ssi:143
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:137
+#: en/user_examples.ssi:145
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:139
+#: en/user_examples.ssi:147
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 "
@@ -463,47 +476,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:151
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:155
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:151
+#: en/user_examples.ssi:159
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:163
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:167
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:171
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:175
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:179
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -514,7 +527,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:173
+#: en/user_examples.ssi:181
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 "
@@ -524,18 +537,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:183
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:177
+#: en/user_examples.ssi:185
#, 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:179
+#: en/user_examples.ssi:187
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
@@ -543,7 +556,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:195
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
@@ -554,7 +567,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:191
+#: en/user_examples.ssi:199
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
@@ -562,7 +575,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:205
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -571,7 +584,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:208
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -579,7 +592,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:211
#, no-wrap
msgid ""
" exit\n"
@@ -587,28 +600,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:215
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:223
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:217
+#: en/user_examples.ssi:225
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:219
+#: 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"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:221
+#: en/user_examples.ssi:229
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 "
@@ -622,7 +635,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:234
#, no-wrap
msgid ""
" $ lb config -k 486 -p minimal --apt-indices false \\\n"
@@ -630,12 +643,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:230
+#: en/user_examples.ssi:238
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:246
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 "
@@ -643,7 +656,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:248
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 "
@@ -661,18 +674,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:250
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:252
#, 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:246
+#: en/user_examples.ssi:254
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 "
@@ -680,7 +693,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:256
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 "
@@ -690,18 +703,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:260
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:264
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:269
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -709,14 +722,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:273
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:271
+#: en/user_examples.ssi:279
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -725,7 +738,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:275
+#: en/user_examples.ssi:283
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, "
@@ -735,7 +748,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:289
+#: en/user_examples.ssi:297
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -752,7 +765,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:292
+#: en/user_examples.ssi:300
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_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index 9a98c39..c94cc38 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-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-07-19 03:36+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:60
#: 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
@@ -60,19 +59,19 @@ msgstr ""
#: 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: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_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_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
@@ -90,8 +89,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:64
#: 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
@@ -131,19 +129,19 @@ msgstr ""
#: 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: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_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_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
@@ -295,7 +293,7 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:58
#, no-wrap
-msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
+msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/es/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index 10bcc9d..4b5ccf5 100644
--- a/manual/po/es/about_manual.ssi.po
+++ b/manual/po/es/about_manual.ssi.po
@@ -608,7 +608,7 @@ msgid ""
msgstr ""
"Se puede realizar la construcción del manual posicionándose en el directorio "
"de nivel superior, o sea, en el directorio clonado mediante Git y ejecutando "
-"la siguiente orden:\n"
+"la siguiente orden:"
#. type: Plain text
#: en/about_manual.ssi:106
@@ -625,7 +625,7 @@ msgid ""
msgstr ""
"Ya que la construcción del manual para todos los idiomas soportados tarda un "
"rato, puede ser mejor crear un solo idioma. Esto puede realizarse ejecutando "
-"la siguiente orden:\n"
+"la siguiente orden:"
#. type: Plain text
#: en/about_manual.ssi:114
@@ -670,12 +670,12 @@ msgstr ""
"Cualquiera puede hacer una entrega en el repositorio. Sin embargo, a la hora "
"de hacer grandes cambios, es conveniente enviarlos a la lista de correo para "
"discutirlos primero. Para realizar una entrega al repositorio se debe seguir "
-"el siguiente procedimiento:\n"
+"el siguiente procedimiento:"
#. type: Plain text
#: en/about_manual.ssi:138
msgid "_* Fetch the public commit key:"
-msgstr "_* Obtener la clave pública de entrega:\n"
+msgstr "_* Obtener la clave pública de entrega:"
#. type: Plain text
#: en/about_manual.ssi:147
@@ -694,7 +694,7 @@ msgstr ""
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
"_* Añadir la siguiente sección en el fichero de configuración de openssh-"
-"client:\n"
+"client:"
#. type: Plain text
#: en/about_manual.ssi:160
@@ -711,7 +711,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:164
msgid "_* Check out a clone of the manual through ssh:"
-msgstr "_* Obtener un clon del manual mediante git utilizando ssh:\n"
+msgstr "_* Obtener un clon del manual mediante git utilizando ssh:"
#. type: Plain text
#: en/about_manual.ssi:169
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index 815ab91..b7ea112 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -1,14 +1,59 @@
+# Spanish translations for live-manual package
+# 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.
+#
+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"
+"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"
+
+#. type: Plain text
+#: en/live-manual.ssm:2
+msgid "% SiSU 2.0"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:4
+msgid "@title: Debian Live Manual"
+msgstr "@title: Manual Debian Live "
+
+#. type: Plain text
+#: en/live-manual.ssm:6
+msgid "@creator: Debian Live Project <debian-live at lists.debian.org>"
+msgstr "@creator: Proyecto Debian Live <debian-live at lists.debian.org>"
+
+#. type: Plain text
+#: en/live-manual.ssm:10
+#, no-wrap
+msgid ""
+"@rights:\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
+" :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.\n"
+msgstr ""
+"@rights:\n"
" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :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\n"
#. type: Plain text
#: en/live-manual.ssm:13
+#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-06-27\n"
+" :published: 2012-07-27\n"
msgstr ""
"@date:\n"
-" :published: 27.06.2012\n"
+" :published: 27.07.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/es/project_bugs.ssi.po b/manual/po/es/project_bugs.ssi.po
index 5c6fbf2..3a6df27 100644
--- a/manual/po/es/project_bugs.ssi.po
+++ b/manual/po/es/project_bugs.ssi.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
-"PO-Revision-Date: 2012-02-19 18:14+0100\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."
@@ -21,11 +21,10 @@ msgstr ""
"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
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: 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: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
@@ -65,19 +64,19 @@ msgstr ""
#: 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: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
@@ -92,11 +91,10 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: 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: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
@@ -136,19 +134,19 @@ msgstr "code{"
#: 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: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
@@ -203,23 +201,23 @@ msgstr ""
#: en/project_bugs.ssi:12
msgid ""
"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
-"build, live-boot, and live-config before submitting a bug report."
+"build, live-boot, live-config and live-tools before submitting a bug report."
msgstr ""
"_* Se debe intentar reproducir el error con las *{versiones más recientes}* "
-"de live-build, live-boot, y live-config antes de presentar un informe de "
-"errores."
+"de live-build, live-boot, live-config y live-tools antes de presentar un "
+"informe de errores."
#. type: Plain text
#: en/project_bugs.ssi:14
msgid ""
"_* Try to give *{as specific information as possible}* about the bug. This "
-"includes (at least) the version of live-build, live-boot, and live-config "
-"used and the distribution of the live system you are building."
+"includes (at least) the version of live-build, live-boot, live-config, and "
+"live-tools used and the distribution of the live system you are building."
msgstr ""
-"_* Se debe intentar dar la *{información tan específica como sea posible}* "
-"acerca del error. Esto incluye (al menos) la versión de live-build, live-"
-"boot, y live-config utilizada y la distribución del sistema en vivo que "
-"está construyendo."
+"_* Se debe intentar proporcionar *{una información tan específica como sea "
+"posible}* acerca del error. Esto incluye (al menos) la versión de live-"
+"build, live-boot, live-config y live-tools utilizada y la distribución del "
+"sistema en vivo que se está construyendo."
#. type: Plain text
#: en/project_bugs.ssi:16
@@ -240,7 +238,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:20
msgid "% FIXME:"
-msgstr ""
+msgstr "% FIXME:"
#. type: Plain text
#: en/project_bugs.ssi:22
@@ -363,28 +361,33 @@ msgstr "_* Versión de live-config en el sistema en vivo."
#. type: Plain text
#: en/project_bugs.ssi:50
+msgid "_* Version of live-tools on the live system"
+msgstr "_* Versión de live-tools en el sistema en vivo."
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
msgid ""
"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
"_* Versión de /{debootstrap}/ y/o /{cdebootstrap}/ en el sistema anfitrión."
#. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
msgid "_* Architecture of the live system"
msgstr "_* Arquitectura del sistema en vivo."
#. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
msgid "_* Distribution of the live system"
msgstr "_* Distribución del sistema en vivo."
#. type: Plain text
-#: en/project_bugs.ssi:56
+#: en/project_bugs.ssi:58
msgid "_* Version of the kernel on the live system"
msgstr "_* Versión del kernel en el sistema en vivo."
#. type: Plain text
-#: en/project_bugs.ssi:58
+#: 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 "
@@ -396,22 +399,21 @@ msgstr ""
"detalles)."
#. type: Plain text
-#: en/project_bugs.ssi:62
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:242
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
-msgstr ""
+msgstr " # lb build 2>&1 | tee build.log\n"
#. type: Plain text
-#: en/project_bugs.ssi:66
-msgid ""
-"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
-"live-boot.log}#)."
+#: en/project_bugs.ssi:68
+msgid "At boot time, live-boot stores a log in #{/var/log/live-boot.log}#."
msgstr ""
-"En el momento del arranque, live-boot guarda un log en #{/var/log/live.log}# "
-"(o #{/var/log/live-boot.log}#)."
+"En el momento del arranque, live-boot guarda un log en #{/var/log/live-boot."
+"log}#."
#. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
msgid ""
"Additionally, to rule out other errors, it is always a good idea to tar up "
"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
@@ -430,7 +432,7 @@ msgstr ""
"de archivos de los subdirectorios de #{config /}# pero no los incluye)."
#. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
msgid ""
"Remember to send in any logs that were produced with English locale "
"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -442,12 +444,12 @@ msgstr ""
"precedidos de #{LC_ALL=C}# o #{LC_ALL=en_US}#."
#. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:74
msgid "2~ Isolate the failing case if possible"
msgstr "2~ Aislar el fallo si es posible"
#. type: Plain text
-#: en/project_bugs.ssi:74
+#: 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 "
@@ -471,22 +473,37 @@ msgstr ""
"más pequeños."
#. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:78
msgid "2~ Use the correct package to report the bug against"
msgstr "2~ Utilizar el paquete correcto sobre el que informar del error"
#. type: Plain text
-#: en/project_bugs.ssi:78
-msgid "Where does the bug appear?"
-msgstr "¿Dónde aparece el error?"
+#: 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."
+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 "
+"de errores contra el pseudo-paquete debian-live."
#. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:82
+msgid ""
+"However, we would appreciate 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."
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
msgid "3~ At build time whilst bootstrapping"
msgstr "3~ En la preinstalación (bootstrap) en tiempo de creación."
#. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:86
msgid ""
"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
@@ -502,7 +519,7 @@ msgstr ""
"herramienta de preinstalación en sí."
#. type: Plain text
-#: en/project_bugs.ssi:84
+#: 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 "
@@ -514,12 +531,12 @@ msgstr ""
"paquete que falla."
#. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:90
msgid "3~ At build time whilst installing packages"
msgstr "3~ Mientras se instalan paquetes en tiempo de creación."
#. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:92
msgid ""
"live-build installs additional packages from the Debian archive and "
"depending on the Debian distribution used and the daily archive state, it "
@@ -532,7 +549,7 @@ msgstr ""
"sistema Debian normal, si el fallo aparece en esta etapa."
#. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:94
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
"- please report it against the failing package. Running /{debootstrap}/ "
@@ -545,7 +562,7 @@ msgstr ""
"o ejecutando #{lb bootstrap --debug}#."
#. type: Plain text
-#: en/project_bugs.ssi:92
+#: 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 "
@@ -556,12 +573,12 @@ msgstr ""
"preinstalando desde una réplica oficial."
#. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:98
msgid "3~ At boot time"
msgstr "3~ En tiempo de arranque"
#. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:100
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
@@ -579,12 +596,12 @@ msgstr ""
"error también es muy útil."
#. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:102
msgid "3~ At run time"
msgstr "3~ En tiempo de ejecución"
#. type: Plain text
-#: en/project_bugs.ssi:100
+#: 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,"
@@ -593,12 +610,12 @@ msgstr ""
"sistema en vivo, esto es probablemente un error en Debian Live. Sin embargo,"
#. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:106
msgid "2~ Do the research"
msgstr "2~ Hacer la investigación"
#. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:108
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 "
@@ -613,7 +630,7 @@ msgstr ""
"exista una posible solución, parche o se haya propuesto una alternativa."
#. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:110
msgid ""
"You should pay particular attention to the Debian Live mailing list, as well "
"as the homepage, as these are likely to contain the most up-to-date "
@@ -626,22 +643,23 @@ msgstr ""
"en su informe de errores."
#. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:112
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, and live-config to see whether something similar has been reported "
-"already."
+"boot, live-config and live-tools to see whether something similar has been "
+"reported already."
msgstr ""
"Además, se debe comprobar las listas de errores actuales de live-build, live-"
-"boot, y live-config y verificar si se ha informado ya de algo similar."
+"boot, live-config y live-tools y verificar si se ha informado ya de algo "
+"similar."
#. type: Plain text
-#: en/project_bugs.ssi:110
+#: en/project_bugs.ssi:114
msgid "2~ Where to report bugs"
msgstr "2~ Dónde informar de los fallos"
#. type: Plain text
-#: en/project_bugs.ssi:112
+#: en/project_bugs.ssi:116
msgid ""
"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
"System (BTS). For information on how to use the system, please see http://"
@@ -655,24 +673,25 @@ msgstr ""
"con el mismo nombre."
#. type: Plain text
-#: en/project_bugs.ssi:114
+#: en/project_bugs.ssi:118
msgid ""
"In general, you should report build time errors against the live-build "
"package, boot time errors against live-boot, and run time errors against "
"live-config. If you are unsure of which package is appropriate or need more "
-"help before submitting a bug report, please send a message to the mailing "
-"list and we will help you to figure it out."
+"help before submitting a bug report, please report it against the debian-"
+"live pseudo-package. We will then take care about it and reassign it where "
+"appropriate."
msgstr ""
-"En general, se debe informar sobre los errores en tiempo de creación en el "
-"BTS contra el paquete live-build. De los fallos en el tiempo de arranque "
-"contra el paquete live-boot, y de los errores en tiempo de ejecución contra "
-"el paquete live-config. Si no se está seguro de qué paquete es el adecuado o "
-"se necesita más ayuda antes de presentar un informe de errores, lo mejor es "
-"enviar un mensaje a la lista de correo y el equipo de Debian Live le ayudará "
-"a resolverlo."
+"En general, se debe informar sobre los errores en tiempo de creación contra "
+"el paquete live-build. De los fallos en tiempo de arranque contra el paquete "
+"live-boot, y de los errores en tiempo de ejecución contra el paquete live-"
+"config. Si no se está seguro de qué paquete es el adecuado o se necesita más "
+"ayuda antes de presentar un informe de errores, lo mejor es enviar un "
+"informe contra el pseudo-paquete debian-live. Nosotros nos encargaremos de "
+"reasignarlo donde sea apropiado."
#. type: Plain text
-#: en/project_bugs.ssi:115
+#: en/project_bugs.ssi:119
msgid ""
"Please note that bugs found in distributions derived from Debian (such as "
"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index b6f5dd8..a9cea2e 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\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"
@@ -64,19 +64,19 @@ msgstr ""
#: 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: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_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_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
@@ -134,19 +134,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -346,7 +346,7 @@ msgstr ""
"comandos:"
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -373,7 +373,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr " # lb build\n"
@@ -692,7 +692,7 @@ msgstr ""
#: en/user_basics.ssi:138
#, no-wrap
msgid "*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
-msgstr "*{Nota:}* Para probar los sistemas en vivo con soporte X.org en /{virtualbox-ose}/, se puede incluir el paquete del driver de VirtualBox X.org, /{virtualbox-ose-guest-x11}/, en la configuración de live-build. De lo contrario, la resolución se limita a 800x600"
+msgstr "*{Nota:}* Para probar los sistemas en vivo con soporte X.org en /{virtualbox-ose}/, se puede incluir el paquete del driver de VirtualBox X.org, /{virtualbox-ose-guest-x11}/, en la configuración de live-build. De lo contrario, la resolución se limita a 800x600.\n"
#. type: Plain text
#: en/user_basics.ssi:142
@@ -731,7 +731,7 @@ msgstr ""
#: en/user_basics.ssi:150
#, no-wrap
msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
-msgstr "*{Nota:}* si se ha creado una imagen ISO híbrida con el ejemplo anterior, se tendrá que limpiar el directorio de trabajo con el comando #{lb clean}# (ver {El comando lb clean}#lb-clean):"
+msgstr "*{Nota:}* si se ha creado una imagen ISO híbrida con el ejemplo anterior, se tendrá que limpiar el directorio de trabajo con el comando #{lb clean}# (ver {El comando lb clean}#lb-clean):\n"
#. type: Plain text
#: en/user_basics.ssi:154 en/user_basics.ssi:220
@@ -858,7 +858,7 @@ msgstr ""
#: en/user_basics.ssi:208
#, no-wrap
msgid "*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.\n"
-msgstr "{Nota:}* Si se desea usar el espacio extra con Windows, segun parece, ese sistema operativo no puede acceder normalmente a otra partición más que a la primera. Se han comentado algunas soluciones a este problema en nuestra {lista de correo}#contact pero según parece no hay una solución fácil."
+msgstr "{Nota:}* Si se desea usar el espacio extra con Windows, segun parece, ese sistema operativo no puede acceder normalmente a otra partición más que a la primera. Se han comentado algunas soluciones a este problema en nuestra {lista de correo}#contact pero según parece no hay una solución fácil.\n"
#. type: Plain text
#: en/user_basics.ssi:210
@@ -886,7 +886,7 @@ msgstr ""
#: en/user_basics.ssi:216
#, no-wrap
msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
-msgstr "*{Nota:}* si se ha seguido algúno de los ejemplos anteriores, se tendrá que limpiar el directorio de trabajo con el comando #{lb clean}#:"
+msgstr "*{Nota:}* si se ha seguido algúno de los ejemplos anteriores, se tendrá que limpiar el directorio de trabajo con el comando #{lb clean}#:\n"
#. type: Plain text
#: en/user_basics.ssi:224
@@ -942,13 +942,13 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
-"Por ejemplo, si se descomprime el archivo generado #{binary-net.tar.gz}# en "
-"el directorio #{/srv/debian-live}#, se verá la imagen del sistema de "
+"Por ejemplo, si se descomprime el archivo generado #{binary.netboot.tar.xz}# "
+"en el directorio #{/srv/debian-live}#, se verá la imagen del sistema de "
"ficheros en #{live/filesystem.squashfs}# y el kernel, initrd y el gestor de "
"arranque pxelinux en #{tftpboot/debian-live/i386}#."
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 954b3cf..9e2bffd 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
"POT-Creation-Date: 2012-04-14 22:45+0300\n"
-"PO-Revision-Date: 2012-02-19 17:53+0100\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"
@@ -541,7 +541,7 @@ msgstr ""
#: en/user_customization-packages.ssi:95
#, no-wrap
msgid "*{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.\n"
-msgstr "*{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 ."
+msgstr "*{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.\n"
#. type: Plain text
#: en/user_customization-packages.ssi:97
@@ -608,7 +608,7 @@ msgstr ""
#: en/user_customization-packages.ssi:115
#, 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"
+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
@@ -766,7 +766,10 @@ msgid ""
" #if ARCHITECTURES amd64\n"
" #include <gnome-full>\n"
" #endif\n"
-msgstr " "
+msgstr ""
+" #if ARCHITECTURES amd64\n"
+" #include <gnome-full>\n"
+" #endif\n"
#. type: Plain text
#: en/user_customization-packages.ssi:178
@@ -1373,7 +1376,7 @@ msgstr ""
#: en/user_customization-packages.ssi:331
#, 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"
+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
diff --git a/manual/po/es/user_customization-runtime.ssi.po b/manual/po/es/user_customization-runtime.ssi.po
index 7278526..f6f129d 100644
--- a/manual/po/es/user_customization-runtime.ssi.po
+++ b/manual/po/es/user_customization-runtime.ssi.po
@@ -8,8 +8,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-09 20:31+0300\n"
-"PO-Revision-Date: 2012-03-24 13:18+0100\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."
@@ -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
@@ -64,19 +64,19 @@ msgstr ""
#: 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-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 +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
@@ -134,19 +134,19 @@ msgstr "code{"
#: 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-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
@@ -262,14 +262,14 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"prefix it accordingly (e.g. 2000-passwd) and add it to #{config/includes."
"chroot/lib/live/config/}#"
msgstr ""
"Una posible forma de cambiar la contraseña por defecto es usando un script "
"gancho (hook) tal y como se describe en {Scripts gancho en tiempo de "
"arranque}#boot-time-hooks. Para conseguirlo se puede usar el script gancho "
"«passwd» de #{/usr/share/doc/live-config/examples/hooks}#, ponerle un "
-"prefijo adecuado (p.ej. 200-passwd) y añadirlo a #{config/includes.chroot/"
+"prefijo adecuado (p.ej. 2000-passwd) y añadirlo a #{config/includes.chroot/"
"lib/live/config/}#"
#. type: Plain text
@@ -281,9 +281,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
-"Cuando el sistema en vivo arranca, el idioma está implicado en tres pasos:"
+"Cuando el sistema en vivo arranca, el idioma está implicado en dos pasos:"
#. type: Plain text
#: en/user_customization-runtime.ssi:39
@@ -292,134 +292,167 @@ msgstr "_* Generar las variantes locales"
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
-msgstr "_* Establecer la distribución del teclado para el consola"
+msgid "_* setting the keyboard configuration"
+msgstr "_* Establecer la distribución del teclado"
#. type: Plain text
#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
-msgstr "_* Establecer la distribución del teclado para el entorno gráfico X"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:45
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"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."
msgstr ""
-"La variante local predeterminada en la creación de un sistema en vivo es "
-"\"locales=en_US.UTF-8\". Para definir la variante local que se debe generar, "
+"La variante local predeterminada en la creación de un sistema en vivo es #"
+"{locales=en_US.UTF-8}#. Para definir la variante local que se debe generar, "
"se puede utilizar el parámetro #{locales}# en la opción #{--bootappend-live}"
"# de #{lb config}#, p.ej."
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+"Se pueden especificar diversas variantes locales separándolas con comas."
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"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}#."
msgstr ""
-"Este parámetro también se puede utilizar en la línea de comandos del kernel. "
-"Se puede especificar una variante local de esta forma: #{language_country."
-"encoding}#."
+"Este parámetro se puede utilizar en la línea de comandos del kernel, al "
+"igual que los parámetros de configuración del teclado indicados a "
+"continuación. Es posibe configurar una variante local con #{idioma_país}# "
+"(en cuyo caso se utiliza el tipo de codificación por omisión) o también con "
+"la expresión completa #{idioma_país.codificación}#. La lista de todas las "
+"variantes locales está en #{/usr/share/i18n/SUPPORTED}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:55
msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation where the language is spoken, e.g:"
-msgstr ""
-"Tanto la configuración del teclado de la consola y del entorno gráfico X "
-"dependen del parámetro #{keyboard-layouts}# de la opción #{--bootappend-live}"
-"#. Se pueden encontrar opciones válidas de la disposición del teclado en #{/"
-"usr/share/X11/xkb/rules/base.xml}# (bastante limitado a los códigos de país "
-"de dos letras). Para hallar el valor (los dos letras) que corresponde a un "
-"idioma se puede buscar el nombre en inglés de la nación donde se habla el "
-"idioma, por ejemplo:"
+"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:"
+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 "
+"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 "
+"el idioma, por ejemplo:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:72
+msgid ""
+"Note that each variant lists the layout to which it applies in the "
+"description."
+msgstr "Cada variante muestra una descripción de la disposición que aplica."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:74
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"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 ""
-"Por ejemplo, para obtener los ficheros de la variante local de la "
-"disposición del teclado alemán y suizo-alemán en X usar:"
+"Normalmente, sólo es necesario configurar la disposición del teclado. Por "
+"ejemplo, para obtener los ficheros de la variante local de la disposición "
+"del teclado alemán y suizo-alemán en X utilizar:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
+#: en/user_customization-runtime.ssi:78
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:82
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"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:"
msgstr ""
-"Se puede ver una lista de los valores de teclados válidos para la consola "
-"con el siguiente comando:"
+"Sin enbargo, para casos de uso muy específicos, se puede incluir otros "
+"parámetros. Por ejemplo, para configurar un sistema Francés con una "
+"disposición French-Dvorak (también llamado Bepo) en un teclado USB "
+"TypeMatrix EZ-Reach 2030, utilizar:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+" $ lb config --bootappend-live \\\n"
+" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:91
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, 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-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 ""
-"Alternativamente, se puede usar el paquete #{console-setup}# una herramienta "
-"que permite configurar la disposición de la consola utilizando definiciones "
-"X (XKB), a continuación, se puede configurar el teclado con mayor precisión "
-"con las variables #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-"
-"options}# y #{keyboard-model}#; live-boot también usará estos parámetros "
-"para la configuración de X. Por ejemplo, para establecer un sistema francés "
-"con una distribución de teclas francés-Dvorak (llamado Bepo) en un teclado "
-"TypeMatrix, tanto en consola X como X11, se puede utilizar:"
+"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 "
+"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:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:96
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:100
msgid "2~persistence Persistence"
msgstr "2~persistence Persistencia"
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:102
msgid ""
"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 "
@@ -431,7 +464,7 @@ msgstr ""
"reiniciar el sistema en que se ejecuta."
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:104
msgid ""
"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 "
@@ -445,7 +478,7 @@ msgstr ""
"apagar el equipo."
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:106
msgid ""
"'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 "
@@ -463,7 +496,7 @@ msgstr ""
"ram (tmpfs) y los datos guardados en la ram no se guardan tras reiniciar."
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:108
msgid ""
"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 "
@@ -479,7 +512,7 @@ msgstr ""
"especificará en el momento del arranque: #{persistence}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:110
msgid ""
"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 "
@@ -496,19 +529,19 @@ msgstr ""
"siguientes: "
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:112
msgid "_* a partition, identified by its GPT name."
msgstr "_* una partición, identificada por su nombre GPT."
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:114
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
"_* Un sistema de ficheros, identificado por su etiqueta de sistema de "
"ficheros."
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:116
msgid ""
"_* 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 "
@@ -522,7 +555,7 @@ msgstr ""
"\"persistence.ext4\"."
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:118
msgid ""
"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-"
@@ -535,7 +568,7 @@ msgstr ""
"Ver {El fichero live-persistence.conf}#live-persistence-conf"
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:120
msgid ""
"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 "
@@ -546,19 +579,19 @@ msgstr ""
"una llave usb creada con, p.ej."
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:124
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
"Ver {Usar el espacio libre en el dispositivo USB}#using-usb-extra-space."
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
@@ -567,13 +600,13 @@ msgstr ""
"etiqueta con uno de los siguientes:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:138
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
@@ -582,7 +615,7 @@ msgstr ""
"persistencia:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -590,19 +623,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:147
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
"A continuación, copiar el fichero #{persistence}# en la raíz de una "
"partición grabable."
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:149
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr "3~live-persistence-conf El fichero live-persistence.conf"
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -615,7 +648,7 @@ msgstr ""
"directorios hace persistentes y también de que manera."
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:153
msgid ""
"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 "
@@ -629,17 +662,17 @@ msgstr ""
"ext4 en la partición /dev/sdb1:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ 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"
+" # 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:164
msgid ""
"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 "
@@ -658,7 +691,7 @@ msgstr ""
"pueden hacerse persistentes montándolos de forma personalizada."
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:166
msgid ""
"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 "
@@ -681,26 +714,26 @@ msgstr ""
"necesario. (aclaración: normalmente no lo es)."
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
-msgid "3~ Persistence SubText"
-msgstr "3~ SubText persistente"
+#: en/user_customization-runtime.ssi:168
+msgid "3~ Using more than one persistence store"
+msgstr "3~ Utilizar varios medios persistentes"
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:169
msgid ""
-"If a user would need multiple persistence storage of the same type for "
+"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-subtext}# used in "
+"{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-subtext=subText}#."
+"boot parameters of: #{persistence}# #{persistence-label=subText}#."
msgstr ""
"Si un usuario necesita un almacenamiento persistente múltiple del mismo tipo "
"para diferentes lugares o pruebas, tales como #{persistence-nonwork}# y #"
-"{persistence-work}#, el parámetro de arranque #{persistence-subtext}# usado "
+"{persistence-work}#, el parámetro de arranque #{persistence-label}# usado "
"junto con el parámetro de arranque #{persistence}# permitirá medios de "
"almacenamiento persistentes múltiples pero únicos. Un ejemplo sería, si un "
"usuario desea utilizar una partición persistente etiquetada #{persistence-"
"subText}# usaría los parámetros de arranque: #{persistence}# #{persistence-"
-"subtext=subText}#."
+"label=subText}#."
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index e76cc84..64d392b 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -2,14 +2,14 @@
# 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» <chals at altorricon.com>, 2011
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-07 08:43+0300\n"
-"PO-Revision-Date: 2012-02-19 18:29+0100\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."
@@ -69,19 +69,19 @@ msgstr ":B~ Ejemplos"
#: 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: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_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_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
@@ -139,19 +139,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -167,14 +167,20 @@ msgstr "}code"
#. type: Plain text
#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:242
#, 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
+#, 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:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr " # lb build\n"
@@ -433,7 +439,7 @@ msgstr "3~ Primera revisión"
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
-" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/\n"
" $ cd tutorial3\n"
msgstr ""
@@ -455,17 +461,26 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:105
+msgid ""
+"Perform #{lb config}# to generate the config tree, using the #{auto/config}# "
+"script you just created:"
+msgstr ""
+"Ejecutar #{lb config}# para generar el árbol de configuración, utilizando el "
+"script #{auto/config}# que justo se acaba de crear:"
+
+#. type: Plain text
+#: en/user_examples.ssi:113
msgid "Now populate your local package list:"
msgstr "Completar la lista de paquetes local:"
#. type: Plain text
-#: en/user_examples.ssi:109
+#: en/user_examples.ssi:117
#, no-wrap
msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:121
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 #"
@@ -483,12 +498,12 @@ msgstr ""
"iniciales favoritos: /{iceweasel}/ y /{xchat}/."
#. type: Plain text
-#: en/user_examples.ssi:115
+#: en/user_examples.ssi:123
msgid "Now, build the image:"
msgstr "Ahora, crear la imagen:"
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:131
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}#."
@@ -498,7 +513,7 @@ msgstr ""
"{auto/build}#."
#. type: Plain text
-#: en/user_examples.ssi:125
+#: en/user_examples.ssi:133
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 "
@@ -510,7 +525,7 @@ msgstr ""
"primer commit:"
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:139
#, no-wrap
msgid ""
" $ git init\n"
@@ -519,12 +534,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:135
+#: en/user_examples.ssi:143
msgid "3~ Second revision"
msgstr "3~ Segunda revisión"
#. type: Plain text
-#: en/user_examples.ssi:137
+#: en/user_examples.ssi:145
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."
@@ -534,7 +549,7 @@ msgstr ""
"cambios al git."
#. type: Plain text
-#: en/user_examples.ssi:139
+#: en/user_examples.ssi:147
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 "
@@ -548,13 +563,13 @@ msgstr ""
"nueva configuración."
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:151
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:155
msgid ""
"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
@@ -563,35 +578,35 @@ msgstr ""
"{config/package-lists/my.list.chroot}#:"
#. type: Plain text
-#: en/user_examples.ssi:151
+#: en/user_examples.ssi:159
#, 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:155
+#: en/user_examples.ssi:163
msgid "Build again:"
msgstr "Crear de nuevo:"
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:167
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:171
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:167
+#: en/user_examples.ssi:175
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:179
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -609,7 +624,7 @@ msgstr ""
"scripts #{auto}#."
#. type: Plain text
-#: en/user_examples.ssi:173
+#: en/user_examples.ssi:181
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 "
@@ -625,18 +640,18 @@ msgstr ""
"experiencias recogidas de los usuarios de Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:183
msgid "2~ A VNC Kiosk Client"
msgstr "2~ Un cliente VNC kiosk"
#. type: Plain text
-#: en/user_examples.ssi:177
+#: en/user_examples.ssi:185
#, 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:179
+#: en/user_examples.ssi:187
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
@@ -647,7 +662,7 @@ msgstr ""
"desactivando los paquetes recomendados para conseguir un sistema mínimo:"
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:195
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
@@ -658,7 +673,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:191
+#: en/user_examples.ssi:199
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
@@ -670,7 +685,7 @@ msgstr ""
"{192.168.1.2}#:"
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:205
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -679,7 +694,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:208
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -687,7 +702,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:211
#, no-wrap
msgid ""
" exit\n"
@@ -695,28 +710,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:215
msgid "Build the image:"
msgstr "Crear la imagen:"
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:223
msgid "Enjoy."
msgstr "Disfrutarlo."
#. type: Plain text
-#: en/user_examples.ssi:217
+#: en/user_examples.ssi:225
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:219
+#: 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"
msgstr "*{Caso Práctico:}* Crear una imagen estándar quitando algunos componentes para que quepa en un pendrive USB de 128M dejándo espacio libre para poder usarlo.\n"
#. type: Plain text
-#: en/user_examples.ssi:221
+#: en/user_examples.ssi:229
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 "
@@ -740,7 +755,7 @@ msgstr ""
"probable es que se produzca un sistema roto."
#. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:234
#, no-wrap
msgid ""
" $ lb config -k 486 -p minimal --apt-indices false \\\n"
@@ -748,12 +763,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:230
+#: en/user_examples.ssi:238
msgid "Now, build the image in the usual way:"
msgstr "Ahora, crear la imagen de forma habitual:"
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:246
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 "
@@ -765,7 +780,7 @@ msgstr ""
"en el {Tutorial 1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:248
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 "
@@ -797,18 +812,18 @@ msgstr ""
"funcionalidad que se sacrifica con cada optimización."
#. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:250
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:244
+#: en/user_examples.ssi:252
#, 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:246
+#: en/user_examples.ssi:254
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 "
@@ -820,7 +835,7 @@ msgstr ""
"Debian para KDE."
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:256
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 "
@@ -835,18 +850,18 @@ msgstr ""
"proceder, asegurarse de tener ambas cosas:"
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:260
#, 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:256
+#: en/user_examples.ssi:264
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:261
+#: en/user_examples.ssi:269
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -854,7 +869,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:273
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
@@ -863,7 +878,7 @@ msgstr ""
"brazilian-portuguese. Ahora para encontrar las tareas relacionas: "
#. type: Plain text
-#: en/user_examples.ssi:271
+#: en/user_examples.ssi:279
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -872,7 +887,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:275
+#: en/user_examples.ssi:283
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, "
@@ -888,7 +903,7 @@ msgstr ""
"vamos a poner las piezas juntas:"
#. type: Plain text
-#: en/user_examples.ssi:289
+#: en/user_examples.ssi:297
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -905,7 +920,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:292
+#: en/user_examples.ssi:300
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_managing_a_configuration.ssi.po b/manual/po/es/user_managing_a_configuration.ssi.po
index 9273550..9f08a8a 100644
--- a/manual/po/es/user_managing_a_configuration.ssi.po
+++ b/manual/po/es/user_managing_a_configuration.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\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"
@@ -24,8 +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: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:60
#: 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
@@ -65,19 +64,19 @@ msgstr ""
#: 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: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_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_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,8 +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: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:64
#: 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
@@ -136,19 +134,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -349,7 +347,7 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:58
#, no-wrap
-msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
+msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index fe80549..c8f5f14 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -1,7 +1,14 @@
+# French translations for live-manual package
+# 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/>
+#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-27 14:57+0300\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"
@@ -40,12 +47,13 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:13
+#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-06-27\n"
+" :published: 2012-07-27\n"
msgstr ""
"@date:\n"
-" :published: 27.06.2012\n"
+" :published: 27.07.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index db8a5cb..33d7148 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
-"PO-Revision-Date: 2012-04-26 15:09+0200\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"
"Language: fr\n"
@@ -17,11 +17,10 @@ msgstr ""
"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
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: 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: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
@@ -61,19 +60,19 @@ msgstr ""
#: 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: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
@@ -88,11 +87,10 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: 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: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
@@ -132,19 +130,19 @@ msgstr "code{"
#: 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: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
@@ -201,22 +199,23 @@ msgstr ""
#: en/project_bugs.ssi:12
msgid ""
"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
-"build, live-boot, and live-config before submitting a bug report."
+"build, live-boot, live-config and live-tools before submitting a bug report."
msgstr ""
"_* Toujours essayer de reproduire le bogue avec *{les versions les plus "
-"récentes}* de live-build, live-boot, et live-config avant de présenter un "
-"rapport de bogue."
+"récentes}* de live-build, live-boot, live-config et live-tools avant de "
+"présenter un rapport de bogue."
#. type: Plain text
#: en/project_bugs.ssi:14
msgid ""
"_* Try to give *{as specific information as possible}* about the bug. This "
-"includes (at least) the version of live-build, live-boot, and live-config "
-"used and the distribution of the live system you are building."
+"includes (at least) the version of live-build, live-boot, live-config, and "
+"live-tools used and the distribution of the live system you are building."
msgstr ""
"_* Essayez de donner des informations aussi précises que possible sur le "
-"bogue. Cela comprend (au moins) la version de live-build, live-boot et live-"
-"config, de la distribution utilisée et du système live que vous construisez. "
+"bogue. Cela comprend (au moins) la version de live-build, live-boot, live-"
+"config et live-tools, de la distribution utilisée et du système live que "
+"vous construisez. "
#. type: Plain text
#: en/project_bugs.ssi:16
@@ -237,7 +236,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:20
msgid "% FIXME:"
-msgstr ""
+msgstr "% FIXME:"
#. type: Plain text
#: en/project_bugs.ssi:22
@@ -360,28 +359,33 @@ msgstr "_* Version de live-config sur le système live"
#. type: Plain text
#: en/project_bugs.ssi:50
+msgid "_* Version of live-tools on the live system"
+msgstr "_* Version de live-tools sur le système live"
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
msgid ""
"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
"_* Version de /{debootstrap}/ et/ou /{cdebootstrap}/ sur le système hôte"
#. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
msgid "_* Architecture of the live system"
msgstr "_* L'architecture du système live"
#. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
msgid "_* Distribution of the live system"
msgstr "_* Répartition du système live"
#. type: Plain text
-#: en/project_bugs.ssi:56
+#: en/project_bugs.ssi:58
msgid "_* Version of the kernel on the live system"
msgstr "_* Version du noyau sur le système live"
#. type: Plain text
-#: en/project_bugs.ssi:58
+#: 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 "
@@ -393,22 +397,20 @@ msgstr ""
"configuration pour les détails)."
#. type: Plain text
-#: en/project_bugs.ssi:62
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:242
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
-msgstr ""
+msgstr " # lb build 2>&1 | tee build.log\n"
#. type: Plain text
-#: en/project_bugs.ssi:66
-msgid ""
-"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
-"live-boot.log}#)."
+#: en/project_bugs.ssi:68
+msgid "At boot time, live-boot stores a log in #{/var/log/live-boot.log}#."
msgstr ""
-"Au démarrage, live-boot stocke un journal dans #{/var/log/live.log}# (ou #{/"
-"var/log/live-boot.log}#)."
+"Au démarrage, live-boot stocke un journal dans #{/var/log/live-boot.log}#."
#. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
msgid ""
"Additionally, to rule out other errors, it is always a good idea to tar up "
"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
@@ -428,7 +430,7 @@ msgstr ""
"répertoires de #{config/}# mais ne les inclut pas)."
#. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
msgid ""
"Remember to send in any logs that were produced with English locale "
"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -439,12 +441,12 @@ msgstr ""
"précédées par #{LC_ALL=C}# ou #{LC_ALL=en_US}#."
#. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:74
msgid "2~ Isolate the failing case if possible"
msgstr "2~ Isoler le cas qui échoue, si possible"
#. type: Plain text
-#: en/project_bugs.ssi:74
+#: 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 "
@@ -468,22 +470,37 @@ msgstr ""
"developper en petits incréments."
#. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:78
msgid "2~ Use the correct package to report the bug against"
msgstr "2~ Utilisez le paquet adéquat pour rapporter le bogue"
#. type: Plain text
-#: en/project_bugs.ssi:78
-msgid "Where does the bug appear?"
-msgstr "Où est-ce que le bogue apparaît?"
+#: 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."
+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 "
+"bogue sur le pseudo-paquet debian-live."
#. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:82
+msgid ""
+"However, we would appreciate 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."
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
msgid "3~ At build time whilst bootstrapping"
msgstr "3~ Au moment de la construction tandis l'amorçage"
#. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:86
msgid ""
"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
@@ -498,7 +515,7 @@ msgstr ""
"l'outil d'amorçage lui-même."
#. type: Plain text
-#: en/project_bugs.ssi:84
+#: 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 "
@@ -509,12 +526,12 @@ msgstr ""
"rapportez un bogue sur l'outil d'amorçage ou du paquet défaillant. "
#. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:90
msgid "3~ At build time whilst installing packages"
msgstr "3~ Au moment de la construction tandis l'installation de paquets"
#. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:92
msgid ""
"live-build installs additional packages from the Debian archive and "
"depending on the Debian distribution used and the daily archive state, it "
@@ -527,7 +544,7 @@ msgstr ""
"est également reproductible sur un système normal."
#. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:94
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
"- please report it against the failing package. Running /{debootstrap}/ "
@@ -540,7 +557,7 @@ msgstr ""
"l'exécution de #{lb bootstrap --debug}# vous donnera plus d'informations."
#. type: Plain text
-#: en/project_bugs.ssi:92
+#: 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 "
@@ -551,12 +568,12 @@ msgstr ""
"un miroir officiel."
#. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:98
msgid "3~ At boot time"
msgstr "3~ Au moment du démarrage"
#. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:100
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
@@ -574,12 +591,12 @@ msgstr ""
"d'écran de l'échec est également très utile."
#. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:102
msgid "3~ At run time"
msgstr "3~ Au moment de l'exécution"
#. type: Plain text
-#: en/project_bugs.ssi:100
+#: 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,"
@@ -588,12 +605,12 @@ msgstr ""
"système Live, c'est probablement un bogue dans Debian Live. Cependant,"
#. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:106
msgid "2~ Do the research"
msgstr "2~ Faire les recherches"
#. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:108
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 "
@@ -609,7 +626,7 @@ msgstr ""
"contournement a été proposé."
#. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:110
msgid ""
"You should pay particular attention to the Debian Live mailing list, as well "
"as the homepage, as these are likely to contain the most up-to-date "
@@ -622,23 +639,23 @@ msgstr ""
"inclure les références au sein de vos rapport de bogues."
#. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:112
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, and live-config to see whether something similar has been reported "
-"already."
+"boot, live-config and live-tools to see whether something similar has been "
+"reported already."
msgstr ""
"En outre, vous devriez vérifier les listes de bogues en cours de live-build, "
-"live-boot, et live-config pour voir si quelque chose de semblable n'a été "
-"déjà signalée."
+"live-boot, live-config et live-tools pour voir si quelque chose de "
+"semblable n'a été déjà signalée."
#. type: Plain text
-#: en/project_bugs.ssi:110
+#: en/project_bugs.ssi:114
msgid "2~ Where to report bugs"
msgstr "2~ Où rapporter les bogues"
#. type: Plain text
-#: en/project_bugs.ssi:112
+#: en/project_bugs.ssi:116
msgid ""
"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
"System (BTS). For information on how to use the system, please see http://"
@@ -652,23 +669,24 @@ msgstr ""
"du paquet du même nom."
#. type: Plain text
-#: en/project_bugs.ssi:114
+#: en/project_bugs.ssi:118
msgid ""
"In general, you should report build time errors against the live-build "
"package, boot time errors against live-boot, and run time errors against "
"live-config. If you are unsure of which package is appropriate or need more "
-"help before submitting a bug report, please send a message to the mailing "
-"list and we will help you to figure it out."
+"help before submitting a bug report, please report it against the debian-"
+"live pseudo-package. We will then take care about it and reassign it where "
+"appropriate."
msgstr ""
"En général, vous devez signaler les erreurs de construction contre le paquet "
"live-build, les erreurs en temps de démarrage contre live-boot, et les "
"erreurs d'exécution contre live-config. Si vous n'êtes pas sûr de quel "
"paquet est approprié ou avez besoin d'aide avant de soumettre un rapport de "
-"bogue, s'il vous plaît envoyez un message à la liste de diffusion et nous "
-"vous aiderons à décider."
+"bogue, s'il vous plaît signalez le rapport contre le pseudo-paquet debian-"
+"live. Nous le réattribuerons s'il y a lieu."
#. type: Plain text
-#: en/project_bugs.ssi:115
+#: en/project_bugs.ssi:119
msgid ""
"Please note that bugs found in distributions derived from Debian (such as "
"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index 4483ed0..f4a8249 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\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"
@@ -60,19 +60,19 @@ msgstr ""
#: 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: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_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_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
@@ -130,19 +130,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -341,7 +341,7 @@ msgstr ""
"d'autres commandes:"
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -368,7 +368,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -684,7 +684,7 @@ msgstr ""
#: en/user_basics.ssi:138
#, no-wrap
msgid "*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
-msgstr "*{Remarque:}* Pour les systèmes live contenant X.org que vous voulez essayer avec /{virtualbox-ose}/, vous pouvez inclure le paquet des pilotes VirtualBox X.org, /{virtualbox-ose-guest-x11}/, dans votre configuration de live-build. Sinon, la résolution est limitée à 800x600."
+msgstr "*{Remarque:}* Pour les systèmes live contenant X.org que vous voulez essayer avec /{virtualbox-ose}/, vous pouvez inclure le paquet des pilotes VirtualBox X.org, /{virtualbox-ose-guest-x11}/, dans votre configuration de live-build. Sinon, la résolution est limitée à 800x600.\n"
#. type: Plain text
#: en/user_basics.ssi:142
@@ -723,7 +723,7 @@ msgstr ""
#: en/user_basics.ssi:150
#, no-wrap
msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
-msgstr "*{Remarque:}* si vous avez créé une image ISO hybride avec l'exemple précédent, vous devrez nettoyer votre répertoire de travail avec la commande #{lb clean}# (voir {La commande lb clean}#lb-clean):"
+msgstr "*{Remarque:}* si vous avez créé une image ISO hybride avec l'exemple précédent, vous devrez nettoyer votre répertoire de travail avec la commande #{lb clean}# (voir {La commande lb clean}#lb-clean):\n"
#. type: Plain text
#: en/user_basics.ssi:154 en/user_basics.ssi:220
@@ -851,7 +851,7 @@ msgstr ""
#: en/user_basics.ssi:208
#, no-wrap
msgid "*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.\n"
-msgstr "*{Remarque:}* Si vous voulez utiliser l'espace supplémentaire avec Windows, apparemment cet OS ne peut normalement pas accéder à n'importe quelle partition, mais la première. Certaines solutions à ce problème ont été discutées sur notre {liste de diffusion}#contact, mais il semble qu'il n'y a pas de réponses faciles."
+msgstr "*{Remarque:}* Si vous voulez utiliser l'espace supplémentaire avec Windows, apparemment cet OS ne peut normalement pas accéder à n'importe quelle partition, mais la première. Certaines solutions à ce problème ont été discutées sur notre {liste de diffusion}#contact, mais il semble qu'il n'y a pas de réponses faciles.\n"
#. type: Plain text
#: en/user_basics.ssi:210
@@ -879,7 +879,7 @@ msgstr ""
#: en/user_basics.ssi:216
#, no-wrap
msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
-msgstr "*{Remarque:}* Si vous avez réalisé quelque des exemples précédents, vous aurez besoin de nettoyer votre répertoire de travail avec la commande #{lb clean}#:"
+msgstr "*{Remarque:}* Si vous avez réalisé quelque des exemples précédents, vous aurez besoin de nettoyer votre répertoire de travail avec la commande #{lb clean}#:\n"
#. type: Plain text
#: en/user_basics.ssi:224
@@ -935,13 +935,13 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
-"Par exemple, si vous décompressez le fichier généré #{binary-net.tar.gz}# "
-"dans le répertoire #{/srv/debian-live}#, vous trouverez l'image du système "
+"Par exemple, si vous décompressez le fichier généré #{binary.netboot.tar.xz}"
+"# dans le répertoire #{/srv/debian-live}#, vous trouverez l'image du système "
"de fichiers dans #{live/filesystem.squashfs}# et le noyau, initrd et le "
"chargeur d'amorçage pxelinux dans #{tftpboot/debian-live/i386}#."
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index 6c40958..1007262 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -6,21 +6,21 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-09 20:31+0300\n"
-"PO-Revision-Date: 2012-04-29 15:48+0200\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"
"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
@@ -60,19 +60,19 @@ msgstr ""
#: 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-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
@@ -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
@@ -130,19 +130,19 @@ msgstr "code{"
#: 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-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
@@ -257,14 +257,14 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"prefix it accordingly (e.g. 2000-passwd) and add it to #{config/includes."
"chroot/lib/live/config/}#"
msgstr ""
"Une façon possible de changer le mot de passe par défaut est au moyen d'un "
"hook comme décrit dans {Hooks au moment du démarrage}#boot-time-hooks. Pour "
"ce faire vous pouvez utiliser le hook \"passwd\" de #{/usr/share/doc/live-"
-"config/examples/hooks}#, ajouter un préfixe correct (par exemple 200-passwd) "
-"et l'ajouter à #{config/includes.chroot/lib/live/config/}#"
+"config/examples/hooks}#, ajouter un préfixe correct (par exemple 2000-"
+"passwd) et l'ajouter à #{config/includes.chroot/lib/live/config/}#"
#. type: Plain text
#: en/user_customization-runtime.ssi:35
@@ -275,9 +275,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
-"Au démarrage du système live, la langue est impliquée dans trois étapes:"
+"Au démarrage du système live, la langue est impliquée dans deux étapes:"
#. type: Plain text
#: en/user_customization-runtime.ssi:39
@@ -286,134 +286,172 @@ msgstr "_* la génération des paramètres régionaux"
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
-msgstr "_* réglage de la disposition du clavier pour la console"
+msgid "_* setting the keyboard configuration"
+msgstr "_* le réglage de la disposition du clavier"
#. type: Plain text
#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
-msgstr "_* réglage de la disposition du clavier pour X"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:45
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"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."
msgstr ""
"Les paramètres régionaux par défaut pendant la construction d'un système "
-"Live sont \"locales=en_US.UTF-8\". Pour définir les paramètres régionaux qui "
-"doivent être générés, utilisez le paramètre #{locales}# dans l'option #{--"
+"Live sont #{locales=en_US.UTF-8}#. Pour définir les paramètres régionaux qui "
+"doivent être générés, utiliser le paramètre #{locales}# dans l'option #{--"
"bootappend-live}# de #{lb config}#, par exemple"
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+"Multiples paramètres régionaux peuvent être spécifiés en une liste séparée "
+"par des virgules."
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"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}#."
msgstr ""
-"Ce paramètre peut également être utilisé à la ligne de commande du noyau. "
-"Vous pouvez spécifier des paramètres régionaux par #{language_country."
-"encoding}#."
+"Ce paramètre, ainsi que les paramètres de configuration du clavier indiqués "
+"ci-dessous, peut également être utilisé sur la ligne de commande du noyau. "
+"On peut spécifier des paramètres régionaux avec #{language_country}# (dans "
+"ce cas le codage par défaut est utilisé) ou l'expression complete #"
+"{language_country.encoding}#. Une liste des paramètres régionaux et le "
+"codage pour chacun peuvent être trouvés dans #{/usr/share/i18n/SUPPORTED}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:55
msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation 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-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:"
msgstr ""
-"Tant la console et la configuration du clavier X dépendent du paramètre #"
-"{keyboard-layouts}# de l'option #{--bootappend-live}#. Les options valides "
-"pour les dispositions des claviers X peuvent être trouvés dans #{/usr/share/"
-"X11/xkb/rules/base.xml}# (plutôt limitées à des codes des pays à deux "
-"lettres). Pour trouver la valeur (les deux caractères), correspondante à une "
-"langue essayez de rechercher le nom anglais de la nation où la langue est "
-"parlée, par exemple:"
+"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 #{--"
+"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 "
+"nation où la langue est parlée, par exemple:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:72
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Note that each variant lists the layout to which it applies in the "
+"description."
+msgstr "Chaque variante présente une description de la disposition appliquée."
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:74
+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 ""
-"Pour obtenir les fichiers des paramètres régionaux de l'allemand et la "
+"Souvent, seulement la disposition doit être configurée. Par exemple, pour "
+"obtenir les fichiers des paramètres régionaux de l'allemand et la "
"disposition du clavier suisse allemand dans X utiliser:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
+#: en/user_customization-runtime.ssi:78
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
+# Notes:
+# Add Note
+#
+# Extracted comments:
+# type: Plain text
+#
#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:82
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"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:"
msgstr ""
-"Une liste des valeurs valides des claviers pour la console peut être figurée "
-"avec la commande suivante:"
+"Toutefois, pour les cas d'utilisation très spécifiques, on peut inclure "
+"d'autres paramètres. Par exemple, pour mettre en place un système français "
+"avec une disposition French-Dvorak (Bepo) avec un clavier USB TypeMatrix EZ-"
+"Reach 2030, utiliser:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+" $ lb config --bootappend-live \\\n"
+" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:91
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, 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-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 ""
-"Alternativement, vous pouvez utiliser le paquet #{console-setup}#, un outil "
-"pour vous aider à configurer la disposition de la console en utilisant "
-"définitions X (XKB), vous pouvez alors définir votre clavier plus "
-"précisément avec variables #{keyboard-layouts}#, #{keyboard-variant}#, #"
-"{keyboard-options}# et #{keyboard-model}#; live-boot pourra également "
-"utiliser ces paramètres pour la configuration de X. Par exemple, pour mettre "
-"en place un système français avec une disposition Français Dvorak (appelée "
-"Bepo) sur un clavier TypeMatrix, à la fois dans la console et X11, utilisez:"
+"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:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:96
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:100
msgid "2~persistence Persistence"
msgstr "2~persistence Persistance"
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:102
msgid ""
"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 "
@@ -425,7 +463,7 @@ msgstr ""
"l'exécute."
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:104
msgid ""
"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 "
@@ -438,7 +476,7 @@ msgstr ""
"pendant l'exécution du système sont perdus à l'arrêt."
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:106
msgid ""
"'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 "
@@ -457,7 +495,7 @@ msgstr ""
"survivent pas à un redémarrage."
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:108
msgid ""
"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 "
@@ -473,7 +511,7 @@ msgstr ""
"spéciale à préciser au moment du démarrage: #{persistence}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:110
msgid ""
"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 "
@@ -489,19 +527,19 @@ msgstr ""
"de manuel live-boot(7). Un volume persistant est un des éléments suivants:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:112
msgid "_* a partition, identified by its GPT name."
msgstr "_* une partition, identifiée par son nom GPT."
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:114
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
"_* un système de fichiers, identifié par son étiquette de système de "
"fichiers."
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:116
msgid ""
"_* 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 "
@@ -514,7 +552,7 @@ msgstr ""
"du système de fichiers comme extension, par exemple, \"persistence.ext4\"."
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:118
msgid ""
"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-"
@@ -527,7 +565,7 @@ msgstr ""
"fichier live-persistence.conf}#live-persistence-conf"
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:120
msgid ""
"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 "
@@ -538,20 +576,20 @@ msgstr ""
"ou sur une clé usb créée avec, par exemple:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:124
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
"Voir aussi {Utilisation de l'espace disponible sur une clé USB}#using-usb-"
"extra-space."
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
@@ -560,13 +598,13 @@ msgstr ""
"modifier l'étiquette avec l'un des suivants:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:138
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
@@ -575,7 +613,7 @@ msgstr ""
"persistance:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -583,19 +621,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:147
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
"Ensuite, copiez le fichier #{persistence}# à la racine d'une partition "
"accessible en écriture."
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:149
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr "3~live-persistence-conf Le fichier live-persistence.conf"
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -608,7 +646,7 @@ msgstr ""
"répertoires il fait persistants, et de quelle manière."
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:153
msgid ""
"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 "
@@ -622,17 +660,17 @@ msgstr ""
"système de fichiers ext4 sur la partition /dev/sdb1:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ 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"
+" # 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:164
msgid ""
"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 "
@@ -652,7 +690,7 @@ msgstr ""
"rendus persistants en utilisant montages personnalisés."
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:166
msgid ""
"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 "
@@ -675,26 +713,26 @@ msgstr ""
"n'avez généralement pas)."
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
-msgid "3~ Persistence SubText"
-msgstr "3~ SubText persistant"
+#: en/user_customization-runtime.ssi:168
+msgid "3~ Using more than one persistence store"
+msgstr "3~ Utilisation de plusieurs dispositifs de persistance"
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:169
msgid ""
-"If a user would need multiple persistence storage of the same type for "
+"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-subtext}# used in "
+"{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-subtext=subText}#."
+"boot parameters of: #{persistence}# #{persistence-label=subText}#."
msgstr ""
"Si un utilisateur a besoin de stockages persistants multiples du même type "
"pour différents endroits ou l'essai, tel que #{persistence-nonwork}# et #"
-"{persistence-work}#, le paramètre de démarrage #{persistence-subtext}# "
-"utilisé en conjonction avec le paramètre de démarrage #{persistence}# "
-"permettra multiples, mais uniques, supports persistants. Un exemple serait "
-"le cas si un utilisateur voudrait utiliser une partition persistante "
-"étiquetée #{persistence-subText}# il utiliserait les paramètres de "
-"démarrage: #{persistence}# #{persistence-subtext=subText}#."
+"{persistence-work}#, le paramètre de démarrage #{persistence-label}# utilisé "
+"en conjonction avec le paramètre de démarrage #{persistence}# permettra "
+"multiples, mais uniques, supports persistants. Un exemple serait le cas si "
+"un utilisateur voudrait utiliser une partition persistante étiquetée #"
+"{persistence-subText}# il utiliserait les paramètres de démarrage: #"
+"{persistence}# #{persistence-label=subText}#."
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 1a13446..54cf444 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-07 08:43+0300\n"
-"PO-Revision-Date: 2012-03-17 18:13+0100\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"
"Language: fr\n"
@@ -65,19 +65,19 @@ msgstr ":B~ Exemples"
#: 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: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_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_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
@@ -135,19 +135,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -163,14 +163,20 @@ msgstr "}code"
#. type: Plain text
#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:242
#, 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
+#, 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:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -429,7 +435,7 @@ msgstr "3~ Première révision"
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
-" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/\n"
" $ cd tutorial3\n"
msgstr ""
@@ -451,17 +457,26 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:105
+msgid ""
+"Perform #{lb config}# to generate the config tree, using the #{auto/config}# "
+"script you just created:"
+msgstr ""
+"Exécutez #{lb config}# pour générer l'arbre de configuration, en utilisant "
+"le script #{auto/config}# que vous avez crée:"
+
+#. type: Plain text
+#: en/user_examples.ssi:113
msgid "Now populate your local package list:"
msgstr "Maintenant remplir votre liste de paquets locaux:"
#. type: Plain text
-#: en/user_examples.ssi:109
+#: en/user_examples.ssi:117
#, no-wrap
msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:121
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 #"
@@ -480,12 +495,12 @@ msgstr ""
"{xchat}/."
#. type: Plain text
-#: en/user_examples.ssi:115
+#: en/user_examples.ssi:123
msgid "Now, build the image:"
msgstr "Maintenant, construire l'image:"
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:131
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}#."
@@ -495,7 +510,7 @@ msgstr ""
"inclus dans #{auto/build}#."
#. type: Plain text
-#: en/user_examples.ssi:125
+#: en/user_examples.ssi:133
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 "
@@ -507,7 +522,7 @@ msgstr ""
"créé, et ensuite faire le premier commit: "
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:139
#, no-wrap
msgid ""
" $ git init\n"
@@ -516,12 +531,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:135
+#: en/user_examples.ssi:143
msgid "3~ Second revision"
msgstr "3~ Deuxième révision"
#. type: Plain text
-#: en/user_examples.ssi:137
+#: en/user_examples.ssi:145
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."
@@ -531,7 +546,7 @@ msgstr ""
"tester et faire le commit."
#. type: Plain text
-#: en/user_examples.ssi:139
+#: en/user_examples.ssi:147
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 "
@@ -545,13 +560,13 @@ msgstr ""
"configuration."
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:151
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:155
msgid ""
"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
@@ -560,34 +575,34 @@ msgstr ""
"{config/package-lists/my.list.chroot}#:"
#. type: Plain text
-#: en/user_examples.ssi:151
+#: en/user_examples.ssi:159
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:163
msgid "Build again:"
msgstr "Construire à nouveau:"
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:167
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:171
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:167
+#: en/user_examples.ssi:175
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:179
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -605,7 +620,7 @@ msgstr ""
"config}# via leur respectives #{auto}# scripts."
#. type: Plain text
-#: en/user_examples.ssi:173
+#: en/user_examples.ssi:181
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 "
@@ -621,18 +636,18 @@ msgstr ""
"expériences recueillies des utilisateurs de Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:183
msgid "2~ A VNC Kiosk Client"
msgstr "2~ Un client Kiosk VNC "
#. type: Plain text
-#: en/user_examples.ssi:177
+#: en/user_examples.ssi:185
#, 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:179
+#: en/user_examples.ssi:187
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
@@ -643,7 +658,7 @@ msgstr ""
"{xvnc4viewer}/, désactivant «recommends» pour faire un système minimal:"
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:195
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
@@ -654,7 +669,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:191
+#: en/user_examples.ssi:199
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
@@ -665,7 +680,7 @@ msgstr ""
"{xvncviewer}/, en reliant le port #{5901}# sur un serveur à #{192.168.1.2}#:"
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:205
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -674,7 +689,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:208
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -682,7 +697,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:211
#, no-wrap
msgid ""
" exit\n"
@@ -690,28 +705,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:215
msgid "Build the image:"
msgstr "Construire l'image:"
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:223
msgid "Enjoy."
msgstr "Amusez-vous bien!"
#. type: Plain text
-#: en/user_examples.ssi:217
+#: en/user_examples.ssi:225
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:219
+#: 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"
msgstr "*{Cas d'utilisation:}* Créer une image standard avec certains composants éliminés afin de l'adapter sur une clé USB de 128M avec espace laissé pour l'utiliser à votre convenance.\n"
#. type: Plain text
-#: en/user_examples.ssi:221
+#: en/user_examples.ssi:229
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 "
@@ -735,7 +750,7 @@ msgstr ""
"de priorité *{importante}* produira probablement un système live cassé."
#. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:234
#, no-wrap
msgid ""
" $ lb config -k 486 -p minimal --apt-indices false \\\n"
@@ -743,12 +758,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:230
+#: en/user_examples.ssi:238
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:238
+#: en/user_examples.ssi:246
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 "
@@ -760,7 +775,7 @@ msgstr ""
"1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:248
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 "
@@ -793,18 +808,18 @@ msgstr ""
"perte de fonctionnalité."
#. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:250
msgid "2~ A localized KDE desktop and installer"
msgstr "2~ Un bureau KDE localisé et installateur "
#. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:252
#, 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:246
+#: en/user_examples.ssi:254
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 "
@@ -815,7 +830,7 @@ msgstr ""
"qui seraient installés par l'installateur Debian standard pour KDE."
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:256
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 "
@@ -831,19 +846,19 @@ msgstr ""
"avez ces deux choses:"
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:260
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:264
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:261
+#: en/user_examples.ssi:269
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -851,7 +866,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:273
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
@@ -860,7 +875,7 @@ msgstr ""
"clairement, brazilian-portuguese. Maintenant, pour trouver les tâches liées:"
#. type: Plain text
-#: en/user_examples.ssi:271
+#: en/user_examples.ssi:279
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -869,7 +884,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:275
+#: en/user_examples.ssi:283
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, "
@@ -885,7 +900,7 @@ msgstr ""
"Maintenant, nous allons assembler les pièces:"
#. type: Plain text
-#: en/user_examples.ssi:289
+#: en/user_examples.ssi:297
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -902,7 +917,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:292
+#: en/user_examples.ssi:300
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_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index 69e856d..e6d7934 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\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"
@@ -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:60
#: 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
@@ -61,19 +60,19 @@ msgstr ""
#: 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: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_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_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
@@ -91,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:64
#: 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
@@ -132,19 +130,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -336,7 +334,7 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:58
#, no-wrap
-msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
+msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index 5b1b25a..a6f509a 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -1,3 +1,47 @@
+# Italian translations for live-manual package
+# Copyright (C) 2010 lillo sciascia <lillosciascia at gmail.com>
+# Copyright (C) 2011 Carlo Stemberger <carlo.stemberger at gmail.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/>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual\n"
+"POT-Creation-Date: 2012-07-27 00:01+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"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/live-manual.ssm:2
+msgid "% SiSU 2.0"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:4
+msgid "@title: Debian Live Manual"
+msgstr "@title: Manuale di Debian Live"
+
+#. type: Plain text
+#: en/live-manual.ssm:6
+msgid "@creator: Debian Live Project <debian-live at lists.debian.org>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-manual.ssm:10
+#, no-wrap
+msgid ""
+"@rights:\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
+" :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.\n"
+msgstr ""
+"@rights:\n"
" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :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.\n"
@@ -6,8 +50,10 @@
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-06-27\n"
+" :published: 2012-07-27\n"
msgstr ""
+"@date:\n"
+" :published: 2012-07-27\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/it/project_bugs.ssi.po b/manual/po/it/project_bugs.ssi.po
index 38f05e8..ae85fa3 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-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-07-21 03:48+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"
@@ -17,11 +17,10 @@ msgstr ""
"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
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: 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: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
@@ -61,19 +60,19 @@ msgstr ""
#: 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: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
@@ -88,11 +87,10 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: 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: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
@@ -132,19 +130,19 @@ msgstr "code{"
#: 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: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
@@ -197,19 +195,28 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:12
+#, fuzzy
+#| msgid ""
+#| "_* Always try to reproduce the bug with the *{most recent versions}* of "
+#| "live-build, live-boot, and live-config before submitting a bug report."
msgid ""
"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
-"build, live-boot, and live-config before submitting a bug report."
+"build, live-boot, live-config and live-tools before submitting a bug report."
msgstr ""
"_* Prima di inviare una segnalazione di bug provare a riprodurlo con le *"
"{versione più recenti}* di live-build, live-boot e live-config."
#. type: Plain text
#: en/project_bugs.ssi:14
+#, fuzzy
+#| msgid ""
+#| "_* Try to give *{as specific information as possible}* about the bug. "
+#| "This includes (at least) the version of live-build, live-boot, and live-"
+#| "config used and the distribution of the live system you are building."
msgid ""
"_* Try to give *{as specific information as possible}* about the bug. This "
-"includes (at least) the version of live-build, live-boot, and live-config "
-"used and the distribution of the live system you are building."
+"includes (at least) the version of live-build, live-boot, live-config, and "
+"live-tools used and the distribution of the live system you are building."
msgstr ""
"_* Si cerchi di fornire *{informazioni il più dettagliate possibile}* "
"riguardo il bug. Questo comprende (almeno) la versione di live-build, live-"
@@ -358,28 +365,35 @@ msgstr "_* Versione di live-config sul sistema live"
#. type: Plain text
#: en/project_bugs.ssi:50
+#, fuzzy
+#| msgid "_* Version of live-boot on the live system"
+msgid "_* Version of live-tools on the live system"
+msgstr "_* Versione di live-boot sul sistema ospitante"
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
msgid ""
"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
"_* Versione di /{debootstrap}/ o /{cdebootstrap}/ sul sistema ospitante"
#. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
msgid "_* Architecture of the live system"
msgstr "_* Architettura del sistema live"
#. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
msgid "_* Distribution of the live system"
msgstr "_* Distribuzione del sistema live"
#. type: Plain text
-#: en/project_bugs.ssi:56
+#: en/project_bugs.ssi:58
msgid "_* Version of the kernel on the live system"
msgstr "_* Versione del kernel sul sistema live"
#. type: Plain text
-#: en/project_bugs.ssi:58
+#: 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 "
@@ -391,22 +405,25 @@ msgstr ""
"configuration per i dettagli)."
#. type: Plain text
-#: en/project_bugs.ssi:62
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:242
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:66
-msgid ""
-"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
-"live-boot.log}#)."
+#: en/project_bugs.ssi:68
+#, fuzzy
+#| msgid ""
+#| "At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/"
+#| "log/live-boot.log}#)."
+msgid "At boot time, live-boot stores a log in #{/var/log/live-boot.log}#."
msgstr ""
"All'avvio, live-boot conserva un registro in #{/var/log/live.log}# (or #{/"
"var/log/live-boot.log}#)."
#. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
msgid ""
"Additionally, to rule out other errors, it is always a good idea to tar up "
"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
@@ -425,7 +442,7 @@ msgstr ""
"sottodirectory di #{config/}# ma non le include)."
#. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
msgid ""
"Remember to send in any logs that were produced with English locale "
"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -436,12 +453,12 @@ msgstr ""
"{LC_ALL=C}# oppure #{LC_ALL=en_US}#."
#. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:74
msgid "2~ Isolate the failing case if possible"
msgstr "2~ Se possibile isolare il caso non andato a buon fine"
#. type: Plain text
-#: en/project_bugs.ssi:74
+#: 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 "
@@ -464,22 +481,32 @@ msgstr ""
"e bisogna cambiare approccio."
#. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:78
msgid "2~ Use the correct package to report the bug against"
msgstr "2~ Segnalare il bug del pacchetto giusto"
#. type: Plain text
-#: en/project_bugs.ssi:78
-msgid "Where does the bug appear?"
-msgstr "Dove appare il bug?"
+#: 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."
+msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:82
+msgid ""
+"However, we would appreciate if you try to narrow it down according to where "
+"the bug appears."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
msgid "3~ At build time whilst bootstrapping"
msgstr "3~ Durante la compilazione mentre esegue il bootstrap"
#. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:86
msgid ""
"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
@@ -494,7 +521,7 @@ msgstr ""
"probabile) o allo strumento di avvio stesso."
#. type: Plain text
-#: en/project_bugs.ssi:84
+#: 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 "
@@ -506,12 +533,12 @@ msgstr ""
"fallito."
#. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:90
msgid "3~ At build time whilst installing packages"
msgstr "3~ Durante la compilazione mentre installa i pacchetti"
#. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:92
msgid ""
"live-build installs additional packages from the Debian archive and "
"depending on the Debian distribution used and the daily archive state, it "
@@ -524,7 +551,7 @@ msgstr ""
"un sistema normale."
#. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:94
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
"- please report it against the failing package. Running /{debootstrap}/ "
@@ -537,7 +564,7 @@ msgstr ""
"eseguendo #{lb bootstrap --debug}#."
#. type: Plain text
-#: en/project_bugs.ssi:92
+#: 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 "
@@ -547,12 +574,12 @@ msgstr ""
"di proxy è bene riprodurlo avviando da un mirror ufficiale."
#. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:98
msgid "3~ At boot time"
msgstr "3~ In fase di avvio"
#. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:100
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
@@ -569,12 +596,12 @@ msgstr ""
"un'istantanea dello schermo può essere molto utile."
#. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:102
msgid "3~ At run time"
msgstr "3~ In fase di esecuzione"
#. type: Plain text
-#: en/project_bugs.ssi:100
+#: 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,"
@@ -584,12 +611,12 @@ msgstr ""
"Live. Tuttavia,"
#. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:106
msgid "2~ Do the research"
msgstr "2~ Fare la ricerca"
#. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:108
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 "
@@ -604,7 +631,7 @@ msgstr ""
"soluzione temporanea."
#. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:110
msgid ""
"You should pay particular attention to the Debian Live mailing list, as well "
"as the homepage, as these are likely to contain the most up-to-date "
@@ -617,23 +644,28 @@ msgstr ""
"nella segnalazione del bug."
#. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:112
+#, fuzzy
+#| msgid ""
+#| "In addition, you should check the current bug lists for live-build, live-"
+#| "boot, and live-config to see whether something similar has been reported "
+#| "already."
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, and live-config to see whether something similar has been reported "
-"already."
+"boot, live-config and live-tools to see whether something similar has been "
+"reported already."
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 "
"qualcosa di simile."
#. type: Plain text
-#: en/project_bugs.ssi:110
+#: en/project_bugs.ssi:114
msgid "2~ Where to report bugs"
msgstr "2~ Dove segnalare i bug"
#. type: Plain text
-#: en/project_bugs.ssi:112
+#: en/project_bugs.ssi:116
msgid ""
"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
"System (BTS). For information on how to use the system, please see http://"
@@ -646,13 +678,21 @@ msgstr ""
"il comando #{reportbug}# dall'omonimo pacchetto."
#. type: Plain text
-#: en/project_bugs.ssi:114
+#: en/project_bugs.ssi:118
+#, fuzzy
+#| msgid ""
+#| "In general, you should report build time errors against the live-build "
+#| "package, boot time errors against live-boot, and run time errors against "
+#| "live-config. If you are unsure of which package is appropriate or need "
+#| "more help before submitting a bug report, please send a message to the "
+#| "mailing list and we will help you to figure it out."
msgid ""
"In general, you should report build time errors against the live-build "
"package, boot time errors against live-boot, and run time errors against "
"live-config. If you are unsure of which package is appropriate or need more "
-"help before submitting a bug report, please send a message to the mailing "
-"list and we will help you to figure it out."
+"help before submitting a bug report, please report it against the debian-"
+"live pseudo-package. We will then take care about it and reassign it where "
+"appropriate."
msgstr ""
"In genere bisogna riportare gli errori in fase di compilazione verso il "
"pacchetto live-build, quelli di avvio verso live-boot e quelli in fase di "
@@ -661,7 +701,7 @@ msgstr ""
"messaggio in mailing list e vi aiuteremo a capire."
#. type: Plain text
-#: en/project_bugs.ssi:115
+#: en/project_bugs.ssi:119
msgid ""
"Please note that bugs found in distributions derived from Debian (such as "
"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 898a429..2e02fa7 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2012-04-03 17:59+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -61,19 +61,19 @@ msgstr ""
#: 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: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_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_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
@@ -131,19 +131,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -339,7 +339,7 @@ msgstr ""
"altri comandi:"
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -366,7 +366,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -678,7 +678,7 @@ msgstr ""
#: en/user_basics.ssi:138
#, no-wrap
msgid "*{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.\n"
-msgstr "*{Nota:}* per sistemi live contenenti X.org che si vogliono provare con /{virtualbox-ose}/, si può voler includere il pacchetto dei driver per X.org di VirtualBox, /{virtualbox-ose-guest-x11}/, nella configurazione di live-build. In caso contrario la risoluzione è limitata a 800x600."
+msgstr "*{Nota:}* per sistemi live contenenti X.org che si vogliono provare con /{virtualbox-ose}/, si può voler includere il pacchetto dei driver per X.org di VirtualBox, /{virtualbox-ose-guest-x11}/, nella configurazione di live-build. In caso contrario la risoluzione è limitata a 800x600.\n"
#. type: Plain text
#: en/user_basics.ssi:142
@@ -717,7 +717,7 @@ msgstr ""
#: en/user_basics.ssi:150
#, no-wrap
msgid "*{Note:}* if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):\n"
-msgstr "*{Nota:}* se si è creata un'immagine ISO ibrida con gli esempi precedenti, occorre pulire la directory di lavoro con il comando #{lb clean}# (vedere {Il comando lb clean}#lb-clean):"
+msgstr "*{Nota:}* se si è creata un'immagine ISO ibrida con gli esempi precedenti, occorre pulire la directory di lavoro con il comando #{lb clean}# (vedere {Il comando lb clean}#lb-clean):\n"
#. type: Plain text
#: en/user_basics.ssi:154 en/user_basics.ssi:220
@@ -844,7 +844,7 @@ msgstr ""
#: en/user_basics.ssi:208
#, no-wrap
msgid "*{Note:}* If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our {mailing list}#contact, but it seems there are no easy answers.\n"
-msgstr "*{Nota:}* se si desidera utilizzare lo spazio extra con Windows pare che questo sistema operativo non possa accedere a nessuna partizione eccetto la prima. Alcune soluzioni a questo problema sono state discusse sulla nostra {mailing list}#contact, ma non sembrano esserci risposte semplici."
+msgstr "*{Nota:}* se si desidera utilizzare lo spazio extra con Windows pare che questo sistema operativo non possa accedere a nessuna partizione eccetto la prima. Alcune soluzioni a questo problema sono state discusse sulla nostra {mailing list}#contact, ma non sembrano esserci risposte semplici.\n"
#. type: Plain text
#: en/user_basics.ssi:210
@@ -872,7 +872,7 @@ msgstr ""
#: en/user_basics.ssi:216
#, no-wrap
msgid "*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:\n"
-msgstr "*{Nota:}* se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire la directory di lavoro con il comando #{lb clean}#:"
+msgstr "*{Nota:}* se qualcuno tra gli esempi precedenti è stato seguito, bisogna pulire la directory di lavoro con il comando #{lb clean}#:\n"
#. type: Plain text
#: en/user_basics.ssi:224
@@ -927,12 +927,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
-"Per esempio, estraendo l'archivio generato #{binary-net.tar.gz}# nella "
+"Per esempio, estraendo l'archivio generato #{binary.netboot.tar.xz}# nella "
"directory #{/srv/debian-live}#, si troverà l'immagine del filesystem in #"
"{live/filesystem.squashfs}# mentre il kernel, initrd ed il bootloader "
"pxelinux in #{tftpboot/debian-live/i386}#."
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index c9b6b9f..9519b32 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -528,7 +528,7 @@ msgstr ""
#: en/user_customization-packages.ssi:95
#, no-wrap
msgid "*{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.\n"
-msgstr "*{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."
+msgstr "*{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.\n"
#. type: Plain text
#: en/user_customization-packages.ssi:97
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index 880ad32..ed14ee3 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-06-09 20:31+0300\n"
+"POT-Creation-Date: 2012-07-21 03: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"
@@ -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
@@ -60,19 +60,19 @@ msgstr ""
#: 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-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
@@ -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
@@ -130,19 +130,19 @@ msgstr "code{"
#: 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-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
@@ -253,14 +253,14 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"prefix it accordingly (e.g. 2000-passwd) and add it to #{config/includes."
"chroot/lib/live/config/}#"
msgstr ""
"Un modo per cambiare la password è tramite un hook come descritto in {Hook "
"in fase di avvio}#boot-time-hooks. Si può usare l'hook \"passwd\" da #{/usr/"
"share/doc/live-config/examples/hooks}#, anteponendolo di conseguenza (ad "
-"esempio, 200-passwd) e aggiungerlo al file #{config/includes.chroot/lib/live/"
-"config/}#"
+"esempio, 2000-passwd) e aggiungerlo al file #{config/includes.chroot/lib/"
+"live/config/}#"
#. type: Plain text
#: en/user_customization-runtime.ssi:35
@@ -271,7 +271,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+#, fuzzy
+#| msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr "Quando il sistema live si avvia, la lingua è inserita in tre fasi:"
#. type: Plain text
@@ -281,18 +283,20 @@ msgstr "_* generazione della localizzazione"
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
-msgstr "_* impostazione del layout di tastiera per la console"
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
+#, fuzzy
+#| msgid "_* setting the keyboard layout for X"
+msgid "_* setting the keyboard configuration"
msgstr "impostazione del layout di tastiera per X"
#. type: Plain text
-#: en/user_customization-runtime.ssi:45
+#: en/user_customization-runtime.ssi:43
+#, fuzzy
+#| msgid ""
+#| "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."
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"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."
msgstr ""
@@ -301,29 +305,44 @@ msgstr ""
"{locales}# nell'opzione #{--bootappend-live}# di #{lb config}#:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"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}#."
msgstr ""
-"Questo parametro può inoltre essere usato dalla riga di comando del kernel, "
-"specificando una localizzazione nella forma #{lingua_nazione.codifica}#."
#. type: Plain text
#: en/user_customization-runtime.ssi:55
-msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation where the language is spoken, e.g:"
+#, fuzzy
+#| msgid ""
+#| "Both the console and X keyboard configuration depend on the #{keyboard-"
+#| "layouts}# parameter of the #{--bootappend-live}# option. Valid options "
+#| "for X keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base."
+#| "xml}# (rather limited to two-letters country codes). To find the value "
+#| "(the two characters) corresponding to a language try searching for the "
+#| "english name of the nation where the language is spoken, e.g:"
+msgid ""
+"Both the console and X keyboard configuration are performed by #{live-config}"
+"# using the #{console-setup}# package. To configure them, use the #{keyboard-"
+"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:"
msgstr ""
"Sia la configurazione della tastiera in console sia di X dipendono dal "
"parametro #{keyboard-layouts}# dell'opzione #{--bootappend-live}#. Si "
@@ -334,78 +353,91 @@ msgstr ""
"lingua:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ 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"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-runtime.ssi:72
+msgid ""
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:74
+#, fuzzy
+#| msgid ""
+#| "To get the locale files for German and Swiss German keyboard layout in X "
+#| "use:"
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"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 ""
"Per ottenere i file di localizzazione per il layout di tastiera tedesco e "
"svizzero-tedesco in X:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
+#: en/user_customization-runtime.ssi:78
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8 keyboard-layouts=ch\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:82
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"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:"
msgstr ""
-"Si può ottenere un elenco di valori validi della tastiera per la console con "
-"il seguente comando:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+" $ lb config --bootappend-live \\\n"
+" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:91
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, 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-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 ""
-"In alternativa è possibile utilizzare il pacchetto #{console-setup}#, uno "
-"strumento per configurare il layout della console tramite le definizioni di "
-"X (XKB); si può dunque impostare il layout in modo più preciso con le "
-"variabili #{keyboard-layouts}#, #{keyboard-variant}#, #{keyboard-options}# e "
-"#{keyboard-model}#; live-boot userà questi parametri anche per X. Ad "
-"esempio, per impostare un layout French-Dvorak (chiamato Bepo) su un sistema "
-"francese con una tastiera TypeMatrix, sia in console sia in X11:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:96
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:100
msgid "2~persistence Persistence"
msgstr "2~persistence Persistenza"
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:102
msgid ""
"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 "
@@ -416,7 +448,7 @@ msgstr ""
"ai riavvii dell'hardware della macchina ospitante."
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:104
msgid ""
"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 "
@@ -430,7 +462,7 @@ msgstr ""
"spegnimento."
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:106
msgid ""
"'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 "
@@ -447,7 +479,7 @@ msgstr ""
"sui ram disk non sopravvivono ai riavvii."
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:108
msgid ""
"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 "
@@ -463,7 +495,7 @@ msgstr ""
"da specificare all'avvio: #{persistence}#."
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:110
msgid ""
"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 "
@@ -479,18 +511,18 @@ msgstr ""
"dei seguenti:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:112
msgid "_* a partition, identified by its GPT name."
msgstr ""
"_* una partizione, identificata dal suo nome GPT (GUID Partition Table)."
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:114
msgid "_* a filesystem, identified by its filesystem label."
msgstr "_* un filesystem, identificato dalla sua label."
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:116
msgid ""
"_* 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 "
@@ -504,7 +536,7 @@ msgstr ""
"ext4\"."
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:118
msgid ""
"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-"
@@ -513,7 +545,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:120
msgid ""
"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 "
@@ -521,20 +553,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:124
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
"Vedere anche {Usare lo spazio rimanente su una penna USB}#using-usb-extra-"
"space."
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
@@ -543,13 +575,14 @@ msgstr ""
"l'etichetta con una delle seguenti:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
-#, no-wrap
-msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
+#: en/user_customization-runtime.ssi:134
+#, fuzzy, no-wrap
+#| msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr " $ tune2fs -L persistence /dev/sdb1 # per filesystem ext2,3,4\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:138
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
@@ -558,7 +591,7 @@ msgstr ""
"persistenza:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -568,19 +601,19 @@ msgstr ""
" $ /sbin/mkfs.ext4 -F persistence\n"
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:147
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
"Quindi copiare il file #{persistence}# nella directory radice di una "
"partizione scrivibile e riavviare."
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:149
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -593,7 +626,7 @@ msgstr ""
"persistenti e in che modo."
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:153
msgid ""
"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 "
@@ -607,17 +640,17 @@ msgstr ""
"persistente in un filesystem ext4 sulla partizione /dev/sdb1:"
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ 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"
+" # 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:164
msgid ""
"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 "
@@ -636,7 +669,7 @@ msgstr ""
"essere resa persistente tramite i mount personalizzati."
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:166
msgid ""
"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 "
@@ -658,25 +691,35 @@ msgstr ""
"manpage di live-persistence.conf(5) per sapere come gestire questo caso."
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
-msgid "3~ Persistence SubText"
-msgstr "3~ Sottotesto persistente"
+#: en/user_customization-runtime.ssi:168
+msgid "3~ Using more than one persistence store"
+msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:169
+#, fuzzy
+#| msgid ""
+#| "If a user would need multiple persistence storage 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}#."
msgid ""
-"If a user would need multiple persistence storage of the same type for "
+"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-subtext}# used in "
+"{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-subtext=subText}#."
+"boot parameters of: #{persistence}# #{persistence-label=subText}#."
msgstr ""
"Se un utente avesse bisogno di archiviazioni multiple dello stesso tipo per "
"differenti posti o per test, come #{persistence-casa}# e #{persistence-"
-"lavoro}#, il parametro d'avvio #{persistence-subtext}# usato in congiunzione "
+"lavoro}#, il parametro d'avvio #{persistence-label}# usato in congiunzione "
"con #{persistent}# permetterà supporti persistenti multipli ma univoci. Un "
"esempio potrebbe essere un utente che vuole usare una partizione etichettata "
"come #{persistence-sottotesto}#, userebbe: #{persistence}# #{persistence-"
-"subtext=sottotesto}#."
+"label=sottotesto}#."
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index aa5b4ae..cf0b2ae 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-06-07 08:43+0300\n"
+"POT-Creation-Date: 2012-07-19 03:36+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"
@@ -66,19 +66,19 @@ msgstr ":B~ Esempi"
#: 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: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_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_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
@@ -136,19 +136,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -164,14 +164,20 @@ msgstr "}code"
#. type: Plain text
#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:242
#, 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
+#, 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:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -427,7 +433,7 @@ msgstr "3~ Prima revisione"
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
-" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/\n"
" $ cd tutorial3\n"
msgstr ""
@@ -449,17 +455,24 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:105
+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
msgid "Now populate your local package list:"
msgstr "Popolare ora l'elenco locale dei pacchetti:"
#. type: Plain text
-#: en/user_examples.ssi:109
+#: en/user_examples.ssi:117
#, no-wrap
msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:121
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 #"
@@ -477,12 +490,12 @@ msgstr ""
"{iceweasel}/ e /{xchat}/."
#. type: Plain text
-#: en/user_examples.ssi:115
+#: en/user_examples.ssi:123
msgid "Now, build the image:"
msgstr "Costruire quindi l'immagine:"
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:131
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}#."
@@ -491,7 +504,7 @@ msgstr ""
"{2>&1 | tee build.log}# dato che questo è ora incluso in #{auto/build}#."
#. type: Plain text
-#: en/user_examples.ssi:125
+#: en/user_examples.ssi:133
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 "
@@ -503,7 +516,7 @@ msgstr ""
"creati, e di fare poi il primo commit:"
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:139
#, no-wrap
msgid ""
" $ git init\n"
@@ -512,12 +525,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:135
+#: en/user_examples.ssi:143
msgid "3~ Second revision"
msgstr "3~ Seconda revisione"
#. type: Plain text
-#: en/user_examples.ssi:137
+#: en/user_examples.ssi:145
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."
@@ -527,7 +540,7 @@ msgstr ""
"verifica e commit."
#. type: Plain text
-#: en/user_examples.ssi:139
+#: en/user_examples.ssi:147
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 "
@@ -540,13 +553,13 @@ msgstr ""
"passaggi per rigenerare i file dalla nuova configurazione."
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:151
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:155
msgid ""
"Now append the /{vlc}/ package to our local package list in #{config/package-"
"lists/my.list.chroot}#:"
@@ -555,36 +568,36 @@ msgstr ""
"package-lists/my.list.chroot}#:"
#. type: Plain text
-#: en/user_examples.ssi:151
+#: en/user_examples.ssi:159
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:163
msgid "Build again:"
msgstr "Rigenerare nuovamente:"
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:167
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:171
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:167
+#: en/user_examples.ssi:175
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:179
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -602,7 +615,7 @@ msgstr ""
"#{lb config}# attraverso i loro rispettivi script #{auto}#."
#. type: Plain text
-#: en/user_examples.ssi:173
+#: en/user_examples.ssi:181
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 "
@@ -618,18 +631,18 @@ msgstr ""
"utenti Debian Live."
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:183
msgid "2~ A VNC Kiosk Client"
msgstr "2~ Un client Kiosk VNC"
#. type: Plain text
-#: en/user_examples.ssi:177
+#: en/user_examples.ssi:185
#, 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:179
+#: en/user_examples.ssi:187
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
@@ -641,7 +654,7 @@ msgstr ""
"sistema minimale:"
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:195
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
@@ -652,7 +665,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:191
+#: en/user_examples.ssi:199
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
@@ -664,7 +677,7 @@ msgstr ""
"{192.168.1.2}#:"
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:205
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -673,7 +686,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:208
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -681,7 +694,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:211
#, no-wrap
msgid ""
" exit\n"
@@ -689,28 +702,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:215
msgid "Build the image:"
msgstr "Costruire l'immagine:"
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:223
msgid "Enjoy."
msgstr "Buon divertimento."
#. type: Plain text
-#: en/user_examples.ssi:217
+#: en/user_examples.ssi:225
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:219
+#: 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"
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:221
+#: en/user_examples.ssi:229
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 "
@@ -733,7 +746,7 @@ msgstr ""
"{important}* che molto probabilmente produrrà un sistema live danneggiato."
#. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:234
#, no-wrap
msgid ""
" $ lb config -k 486 -p minimal --apt-indices false \\\n"
@@ -741,12 +754,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:230
+#: en/user_examples.ssi:238
msgid "Now, build the image in the usual way:"
msgstr "Costruire quindi l'immagine nel modo consueto:"
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:246
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 "
@@ -757,7 +770,7 @@ msgstr ""
"prodotta dalla configurazione predefinita nel {Tutorial 1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:248
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 "
@@ -787,18 +800,18 @@ msgstr ""
"se le funzionalità sacrificate con ciascuna ottimizzazione valgono la pena."
#. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:250
msgid "2~ A localized KDE desktop and installer"
msgstr "2~ Un desktop KDE localizzato e l'installer"
#. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:252
#, 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:246
+#: en/user_examples.ssi:254
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 "
@@ -810,7 +823,7 @@ msgstr ""
"KDE."
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:256
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 "
@@ -825,18 +838,18 @@ msgstr ""
"assicursi di avere entrambi questi pacchetti:"
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:260
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:264
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:261
+#: en/user_examples.ssi:269
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -844,7 +857,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:273
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
@@ -853,7 +866,7 @@ msgstr ""
"chiaramente, brazilian-portuguese. Ora per trovare i task correlati:"
#. type: Plain text
-#: en/user_examples.ssi:271
+#: en/user_examples.ssi:279
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -862,7 +875,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:275
+#: en/user_examples.ssi:283
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, "
@@ -877,7 +890,7 @@ msgstr ""
"and-language-tasks). È ora di mettere insieme i pezzi:"
#. type: Plain text
-#: en/user_examples.ssi:289
+#: en/user_examples.ssi:297
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -894,7 +907,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:292
+#: en/user_examples.ssi:300
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_managing_a_configuration.ssi.po b/manual/po/it/user_managing_a_configuration.ssi.po
index 8e6ddce..98cd1bb 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-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-07-19 03:36+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,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:60
#: 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
@@ -61,19 +60,19 @@ msgstr ""
#: 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: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_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_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
@@ -91,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:64
#: 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
@@ -132,19 +130,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -333,7 +331,7 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:58
#, no-wrap
-msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
+msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 23b96d0..5da5144 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -2,10 +2,16 @@
# This file is distributed under the same license as the live-manual package.
# Automatically generated, 2010.
#
+# This po file is part of the live-manual package created by the:
+# Debian Live Project
+# <http://live.debian.net/>
+# e-mail address:
+# <debian-live at lists.debian.org>
+#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-27 14:57+0300\n"
+"POT-Creation-Date: 2012-07-27 00:01+0300\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -41,16 +47,13 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:13
-#, fuzzy, no-wrap
-#| msgid ""
-#| "@date:\n"
-#| " :published: 2012-06-24\n"
+#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-06-27\n"
+" :published: 2012-07-27\n"
msgstr ""
"@date:\n"
-" :published: 27-06-2012\n"
+" :published: 27-07-2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
diff --git a/manual/po/pt_BR/project_bugs.ssi.po b/manual/po/pt_BR/project_bugs.ssi.po
index f1c1f69..a6b3e63 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-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-07-21 03:48+0300\n"
"PO-Revision-Date: 2010-10-25 23:27+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -16,11 +16,10 @@ msgstr ""
"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
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: 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: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
@@ -60,19 +59,19 @@ msgstr ""
#: 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: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
@@ -87,11 +86,10 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: 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: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
@@ -131,19 +129,19 @@ msgstr "code{"
#: 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: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
@@ -192,15 +190,15 @@ msgstr ""
#: en/project_bugs.ssi:12
msgid ""
"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
-"build, live-boot, and live-config before submitting a bug report."
+"build, live-boot, live-config and live-tools before submitting a bug report."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:14
msgid ""
"_* Try to give *{as specific information as possible}* about the bug. This "
-"includes (at least) the version of live-build, live-boot, and live-config "
-"used and the distribution of the live system you are building."
+"includes (at least) the version of live-build, live-boot, live-config, and "
+"live-tools used and the distribution of the live system you are building."
msgstr ""
#. type: Plain text
@@ -316,27 +314,32 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:50
+msgid "_* Version of live-tools on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
msgid ""
"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
msgid "_* Architecture of the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
msgid "_* Distribution of the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:56
+#: en/project_bugs.ssi:58
msgid "_* Version of the kernel on the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:58
+#: 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 "
@@ -344,20 +347,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:62
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:242
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:66
-msgid ""
-"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
-"live-boot.log}#)."
+#: en/project_bugs.ssi:68
+msgid "At boot time, live-boot stores a log in #{/var/log/live-boot.log}#."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
msgid ""
"Additionally, to rule out other errors, it is always a good idea to tar up "
"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
@@ -369,7 +371,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
msgid ""
"Remember to send in any logs that were produced with English locale "
"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -377,12 +379,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:74
msgid "2~ Isolate the failing case if possible"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:74
+#: 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 "
@@ -396,22 +398,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:78
msgid "2~ Use the correct package to report the bug against"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:78
-msgid "Where does the bug appear?"
+#: 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."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:82
+msgid ""
+"However, we would appreciate if you try to narrow it down according to where "
+"the bug appears."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
msgid "3~ At build time whilst bootstrapping"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:86
msgid ""
"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
@@ -421,7 +433,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:84
+#: 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 "
@@ -429,12 +441,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:90
msgid "3~ At build time whilst installing packages"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:92
msgid ""
"live-build installs additional packages from the Debian archive and "
"depending on the Debian distribution used and the daily archive state, it "
@@ -443,7 +455,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:94
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
"- please report it against the failing package. Running /{debootstrap}/ "
@@ -452,7 +464,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:92
+#: 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 "
@@ -460,12 +472,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:98
msgid "3~ At boot time"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:100
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
@@ -476,24 +488,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:102
msgid "3~ At run time"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:100
+#: 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,"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:106
msgid "2~ Do the research"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:108
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 "
@@ -503,7 +515,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:110
msgid ""
"You should pay particular attention to the Debian Live mailing list, as well "
"as the homepage, as these are likely to contain the most up-to-date "
@@ -512,20 +524,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:112
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, and live-config to see whether something similar has been reported "
-"already."
+"boot, live-config and live-tools to see whether something similar has been "
+"reported already."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:110
+#: en/project_bugs.ssi:114
msgid "2~ Where to report bugs"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:112
+#: en/project_bugs.ssi:116
msgid ""
"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
"System (BTS). For information on how to use the system, please see http://"
@@ -534,17 +546,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:114
+#: en/project_bugs.ssi:118
msgid ""
"In general, you should report build time errors against the live-build "
"package, boot time errors against live-boot, and run time errors against "
"live-config. If you are unsure of which package is appropriate or need more "
-"help before submitting a bug report, please send a message to the mailing "
-"list and we will help you to figure it out."
+"help before submitting a bug report, please report it against the debian-"
+"live pseudo-package. We will then take care about it and reassign it where "
+"appropriate."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:115
+#: en/project_bugs.ssi:119
msgid ""
"Please note that bugs found in distributions derived from Debian (such as "
"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 9168165..b80c738 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -59,19 +59,19 @@ msgstr ""
#: 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: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_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_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
@@ -129,19 +129,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -280,7 +280,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -302,7 +302,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -749,8 +749,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
diff --git a/manual/po/pt_BR/user_customization-runtime.ssi.po b/manual/po/pt_BR/user_customization-runtime.ssi.po
index 8b476e5..f801ce4 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-06-09 20:31+0300\n"
+"POT-Creation-Date: 2012-07-21 03:48+0300\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\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
@@ -59,19 +59,19 @@ msgstr ""
#: 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-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
@@ -89,7 +89,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
@@ -129,19 +129,19 @@ msgstr "code{"
#: 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-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
@@ -234,7 +234,7 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"prefix it accordingly (e.g. 2000-passwd) and add it to #{config/includes."
"chroot/lib/live/config/}#"
msgstr ""
@@ -245,7 +245,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
#. type: Plain text
@@ -255,108 +255,130 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
+msgid "_* setting the keyboard configuration"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:45
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"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}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:55
msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation 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-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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:72
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
+#: en/user_customization-runtime.ssi:74
+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 ""
+
+#. 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 ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:82
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+" $ lb config --bootappend-live \\\n"
+" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:91
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, 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-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 ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:96
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:100
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:102
msgid ""
"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 "
@@ -364,7 +386,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:104
msgid ""
"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 "
@@ -373,7 +395,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:106
msgid ""
"'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 "
@@ -384,7 +406,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:108
msgid ""
"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 "
@@ -394,7 +416,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:110
msgid ""
"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 "
@@ -404,17 +426,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:112
msgid "_* a partition, identified by its GPT name."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:114
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:116
msgid ""
"_* 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 "
@@ -423,7 +445,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:118
msgid ""
"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-"
@@ -432,7 +454,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:120
msgid ""
"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 "
@@ -440,38 +462,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:124
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:138
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -479,17 +501,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:147
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:149
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -498,7 +520,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:153
msgid ""
"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 "
@@ -507,17 +529,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ 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"
+" # 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:164
msgid ""
"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 "
@@ -529,7 +551,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:166
msgid ""
"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 "
@@ -542,18 +564,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
-msgid "3~ Persistence SubText"
+#: en/user_customization-runtime.ssi:168
+msgid "3~ Using more than one persistence store"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:169
msgid ""
-"If a user would need multiple persistence storage of the same type for "
+"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-subtext}# used in "
+"{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-subtext=subText}#."
+"boot parameters of: #{persistence}# #{persistence-label=subText}#."
msgstr ""
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index 6e5ebc2..bc1e14c 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-06-07 08:43+0300\n"
+"POT-Creation-Date: 2012-07-19 03:36+0300\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -64,19 +64,19 @@ msgstr ""
#: 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: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_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_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
@@ -134,19 +134,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -162,14 +162,20 @@ msgstr "}code"
#. type: Plain text
#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:242
#, 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
+#, 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:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -370,7 +376,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
-" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/\n"
" $ cd tutorial3\n"
msgstr ""
@@ -392,17 +398,24 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:105
+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
msgid "Now populate your local package list:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:109
+#: en/user_examples.ssi:117
#, no-wrap
msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:121
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 #"
@@ -413,19 +426,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:115
+#: en/user_examples.ssi:123
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:131
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:125
+#: en/user_examples.ssi:133
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 "
@@ -433,7 +446,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:139
#, no-wrap
msgid ""
" $ git init\n"
@@ -442,19 +455,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:135
+#: en/user_examples.ssi:143
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:137
+#: en/user_examples.ssi:145
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:139
+#: en/user_examples.ssi:147
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 "
@@ -463,47 +476,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:151
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:155
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:151
+#: en/user_examples.ssi:159
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:163
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:167
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:171
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:175
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:179
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -514,7 +527,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:173
+#: en/user_examples.ssi:181
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 "
@@ -524,18 +537,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:183
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:177
+#: en/user_examples.ssi:185
#, 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:179
+#: en/user_examples.ssi:187
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
@@ -543,7 +556,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:195
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
@@ -554,7 +567,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:191
+#: en/user_examples.ssi:199
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
@@ -562,7 +575,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:205
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -571,7 +584,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:208
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -579,7 +592,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:211
#, no-wrap
msgid ""
" exit\n"
@@ -587,28 +600,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:215
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:223
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:217
+#: en/user_examples.ssi:225
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:219
+#: 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"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:221
+#: en/user_examples.ssi:229
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 "
@@ -622,7 +635,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:234
#, no-wrap
msgid ""
" $ lb config -k 486 -p minimal --apt-indices false \\\n"
@@ -630,12 +643,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:230
+#: en/user_examples.ssi:238
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:246
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 "
@@ -643,7 +656,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:248
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 "
@@ -661,18 +674,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:250
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:252
#, 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:246
+#: en/user_examples.ssi:254
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 "
@@ -680,7 +693,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:256
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 "
@@ -690,18 +703,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:260
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:264
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:269
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -709,14 +722,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:273
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:271
+#: en/user_examples.ssi:279
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -725,7 +738,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:275
+#: en/user_examples.ssi:283
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, "
@@ -735,7 +748,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:289
+#: en/user_examples.ssi:297
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -752,7 +765,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:292
+#: en/user_examples.ssi:300
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_managing_a_configuration.ssi.po b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
index 2f46979..f576f70 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-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-07-19 03:36+0300\n"
"PO-Revision-Date: 2010-10-13 17:00+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:60
#: 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
@@ -60,19 +59,19 @@ msgstr ""
#: 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: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_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_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
@@ -90,8 +89,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:64
#: 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
@@ -131,19 +129,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -295,7 +293,7 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:58
#, no-wrap
-msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
+msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index 5e7e64b..d4d967f 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -57,9 +57,9 @@ msgid ""
"command."
msgstr ""
"Anumite comenzi din text trebuie sa fie executate ca 'super_utilizator', "
-"privilegiu care poate fi obtinut fie prin comanda #{su}, sau #{sudo}. Pentru "
-"a distinge intre acesti utilizatori se vor folosi #{$}# respectiv #{#}# . "
-"Aceste simboluri nu fac parte din comenzi."
+"privilegiu care poate fi obtinut fie prin comanda #{su}#, sau #{sudo}#. "
+"Pentru a distinge intre acesti utilizatori se vor folosi #{$}# respectiv #{#}"
+"# . Aceste simboluri nu fac parte din comenzi."
#. type: Plain text
#: en/about_manual.ssi:12
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index eac3191..b1bad54 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -1,13 +1,15 @@
# Romanian translations for live-manual package
# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
+# Victor Nitu <victor at debian-linux.ro>, 2012.
+# This po file is part of the live-manual package created by the:
+# Debian Live Project <http://live.debian.net/>
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-27 14:57+0300\n"
-"PO-Revision-Date: 2010-10-23 00:04+0300\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2012-07-27 00:01+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"
"Language: ro\n"
"MIME-Version: 1.0\n"
@@ -19,17 +21,17 @@ msgstr ""
#. 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
msgid "@title: Debian Live Manual"
-msgstr ""
+msgstr "@title: Manualul Debian Live"
#. type: Plain text
#: en/live-manual.ssm:6
msgid "@creator: Debian Live Project <debian-live at lists.debian.org>"
-msgstr ""
+msgstr "@creator: Proiectul Debian Live <debian-live at lists.debian.org>"
#. type: Plain text
#: en/live-manual.ssm:10
@@ -39,24 +41,24 @@ msgid ""
" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :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.\n"
msgstr ""
+"@rights:\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
+" :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.\n"
#. type: Plain text
#: en/live-manual.ssm:13
-#, fuzzy, no-wrap
-#| msgid ""
-#| "@date:\n"
-#| " :published: 2012-06-24\n"
+#, no-wrap
msgid ""
"@date:\n"
-" :published: 2012-06-27\n"
+" :published: 2012-07-27\n"
msgstr ""
"@date:\n"
-" :published: 27.06.2012\n"
+" :published: 27.07.2012\n"
#. type: Plain text
#: en/live-manual.ssm:15
msgid "@publisher: Debian Live Project <debian-live at lists.debian.org>"
-msgstr ""
+msgstr "@publisher: Proiectul Debian Live <debian-live at lists.debian.org>"
#. type: Plain text
#: en/live-manual.ssm:21
@@ -68,118 +70,123 @@ msgid ""
" :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"
+" :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
msgid ":B~ About"
-msgstr ""
+msgstr ":B~ Despre"
#. 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
msgid ":B~ User"
-msgstr ""
+msgstr ":B~ Utilizator"
#. 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
msgid ":B~ Project"
-msgstr ""
+msgstr ":B~ Proiect"
#. 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
msgid ":B~ Examples"
-msgstr ""
+msgstr ":B~ Exemple"
#. 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~ Anexă"
#. type: Plain text
#: en/live-manual.ssm:66
msgid "<< style_guide.ssi"
-msgstr ""
+msgstr "<< style_guide.ssi"
diff --git a/manual/po/ro/project_bugs.ssi.po b/manual/po/ro/project_bugs.ssi.po
index b8674b6..facc2ee 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-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-07-21 03:48+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"
@@ -17,11 +17,10 @@ msgstr ""
"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
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: 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: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
@@ -61,19 +60,19 @@ msgstr ""
#: 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: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
@@ -88,11 +87,10 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: 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: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
@@ -132,19 +130,19 @@ msgstr "code{"
#: 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: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
@@ -193,15 +191,15 @@ msgstr ""
#: en/project_bugs.ssi:12
msgid ""
"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
-"build, live-boot, and live-config before submitting a bug report."
+"build, live-boot, live-config and live-tools before submitting a bug report."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:14
msgid ""
"_* Try to give *{as specific information as possible}* about the bug. This "
-"includes (at least) the version of live-build, live-boot, and live-config "
-"used and the distribution of the live system you are building."
+"includes (at least) the version of live-build, live-boot, live-config, and "
+"live-tools used and the distribution of the live system you are building."
msgstr ""
#. type: Plain text
@@ -317,27 +315,32 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:50
+msgid "_* Version of live-tools on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
msgid ""
"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
msgid "_* Architecture of the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
msgid "_* Distribution of the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:56
+#: en/project_bugs.ssi:58
msgid "_* Version of the kernel on the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:58
+#: 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 "
@@ -345,20 +348,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:62
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:242
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:66
-msgid ""
-"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
-"live-boot.log}#)."
+#: en/project_bugs.ssi:68
+msgid "At boot time, live-boot stores a log in #{/var/log/live-boot.log}#."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
msgid ""
"Additionally, to rule out other errors, it is always a good idea to tar up "
"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
@@ -370,7 +372,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
msgid ""
"Remember to send in any logs that were produced with English locale "
"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -378,12 +380,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:74
msgid "2~ Isolate the failing case if possible"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:74
+#: 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 "
@@ -397,22 +399,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:78
msgid "2~ Use the correct package to report the bug against"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:78
-msgid "Where does the bug appear?"
+#: 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."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:82
+msgid ""
+"However, we would appreciate if you try to narrow it down according to where "
+"the bug appears."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
msgid "3~ At build time whilst bootstrapping"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:86
msgid ""
"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
@@ -422,7 +434,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:84
+#: 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 "
@@ -430,12 +442,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:90
msgid "3~ At build time whilst installing packages"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:92
msgid ""
"live-build installs additional packages from the Debian archive and "
"depending on the Debian distribution used and the daily archive state, it "
@@ -444,7 +456,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:94
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
"- please report it against the failing package. Running /{debootstrap}/ "
@@ -453,7 +465,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:92
+#: 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 "
@@ -461,12 +473,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:98
msgid "3~ At boot time"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:100
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
@@ -477,24 +489,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:102
msgid "3~ At run time"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:100
+#: 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,"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:106
msgid "2~ Do the research"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:108
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 "
@@ -504,7 +516,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:110
msgid ""
"You should pay particular attention to the Debian Live mailing list, as well "
"as the homepage, as these are likely to contain the most up-to-date "
@@ -513,20 +525,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:112
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, and live-config to see whether something similar has been reported "
-"already."
+"boot, live-config and live-tools to see whether something similar has been "
+"reported already."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:110
+#: en/project_bugs.ssi:114
msgid "2~ Where to report bugs"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:112
+#: en/project_bugs.ssi:116
msgid ""
"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
"System (BTS). For information on how to use the system, please see http://"
@@ -535,17 +547,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:114
+#: en/project_bugs.ssi:118
msgid ""
"In general, you should report build time errors against the live-build "
"package, boot time errors against live-boot, and run time errors against "
"live-config. If you are unsure of which package is appropriate or need more "
-"help before submitting a bug report, please send a message to the mailing "
-"list and we will help you to figure it out."
+"help before submitting a bug report, please report it against the debian-"
+"live pseudo-package. We will then take care about it and reassign it where "
+"appropriate."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:115
+#: en/project_bugs.ssi:119
msgid ""
"Please note that bugs found in distributions derived from Debian (such as "
"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/po/ro/style_guide.ssi.po b/manual/po/ro/style_guide.ssi.po
index aa74793..47e0830 100644
--- a/manual/po/ro/style_guide.ssi.po
+++ b/manual/po/ro/style_guide.ssi.po
@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:65 en/style_guide.ssi:2
msgid ":B~ Appendix"
-msgstr ""
+msgstr ":B~ Anexă"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 814e991..40e8d46 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19:47+0300\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -60,19 +60,19 @@ msgstr ""
#: 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: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_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_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
@@ -130,19 +130,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -281,7 +281,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -303,7 +303,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -750,8 +750,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
diff --git a/manual/po/ro/user_customization-runtime.ssi.po b/manual/po/ro/user_customization-runtime.ssi.po
index 2b31020..da6e70f 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-06-09 20:31+0300\n"
+"POT-Creation-Date: 2012-07-21 03:48+0300\n"
"PO-Revision-Date: 2010-11-30 11:40+0100\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
@@ -60,19 +60,19 @@ msgstr ""
#: 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-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
@@ -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
@@ -130,19 +130,19 @@ msgstr "code{"
#: 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-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
@@ -235,7 +235,7 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"prefix it accordingly (e.g. 2000-passwd) and add it to #{config/includes."
"chroot/lib/live/config/}#"
msgstr ""
@@ -246,7 +246,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
#. type: Plain text
@@ -256,108 +256,130 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
+msgid "_* setting the keyboard configuration"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:45
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"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}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:55
msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation 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-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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:72
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
+#: en/user_customization-runtime.ssi:74
+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 ""
+
+#. 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 ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:82
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+" $ lb config --bootappend-live \\\n"
+" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:91
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, 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-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 ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:96
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:100
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:102
msgid ""
"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 "
@@ -365,7 +387,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:104
msgid ""
"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 "
@@ -374,7 +396,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:106
msgid ""
"'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 "
@@ -385,7 +407,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:108
msgid ""
"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 "
@@ -395,7 +417,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:110
msgid ""
"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 "
@@ -405,17 +427,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:112
msgid "_* a partition, identified by its GPT name."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:114
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:116
msgid ""
"_* 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 "
@@ -424,7 +446,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:118
msgid ""
"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-"
@@ -433,7 +455,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:120
msgid ""
"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 "
@@ -441,38 +463,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:124
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:138
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -480,17 +502,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:147
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:149
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -499,7 +521,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:153
msgid ""
"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 "
@@ -508,17 +530,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ 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"
+" # 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:164
msgid ""
"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 "
@@ -530,7 +552,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:166
msgid ""
"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 "
@@ -543,18 +565,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
-msgid "3~ Persistence SubText"
+#: en/user_customization-runtime.ssi:168
+msgid "3~ Using more than one persistence store"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:169
msgid ""
-"If a user would need multiple persistence storage of the same type for "
+"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-subtext}# used in "
+"{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-subtext=subText}#."
+"boot parameters of: #{persistence}# #{persistence-label=subText}#."
msgstr ""
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 92faa78..eb2655b 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-06-07 08:43+0300\n"
+"POT-Creation-Date: 2012-07-19 03:36+0300\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#: en/live-manual.ssm:61 en/user_examples.ssi:2
msgid ":B~ Examples"
-msgstr ""
+msgstr ":B~ Exemple"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
@@ -65,19 +65,19 @@ msgstr ""
#: 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: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_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_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
@@ -135,19 +135,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -163,14 +163,20 @@ msgstr "}code"
#. type: Plain text
#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:242
#, 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
+#, 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:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -371,7 +377,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
-" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/\n"
" $ cd tutorial3\n"
msgstr ""
@@ -393,17 +399,24 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:105
+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
msgid "Now populate your local package list:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:109
+#: en/user_examples.ssi:117
#, no-wrap
msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:121
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 #"
@@ -414,19 +427,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:115
+#: en/user_examples.ssi:123
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:131
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:125
+#: en/user_examples.ssi:133
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 "
@@ -434,7 +447,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:139
#, no-wrap
msgid ""
" $ git init\n"
@@ -443,19 +456,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:135
+#: en/user_examples.ssi:143
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:137
+#: en/user_examples.ssi:145
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:139
+#: en/user_examples.ssi:147
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 "
@@ -464,47 +477,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:151
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:155
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:151
+#: en/user_examples.ssi:159
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:163
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:167
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:171
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:175
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:179
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -515,7 +528,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:173
+#: en/user_examples.ssi:181
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 "
@@ -525,18 +538,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:183
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:177
+#: en/user_examples.ssi:185
#, 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:179
+#: en/user_examples.ssi:187
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
@@ -544,7 +557,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:195
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
@@ -555,7 +568,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:191
+#: en/user_examples.ssi:199
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
@@ -563,7 +576,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:205
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -572,7 +585,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:208
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -580,7 +593,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:211
#, no-wrap
msgid ""
" exit\n"
@@ -588,28 +601,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:215
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:223
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:217
+#: en/user_examples.ssi:225
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:219
+#: 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"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:221
+#: en/user_examples.ssi:229
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 "
@@ -623,7 +636,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:234
#, no-wrap
msgid ""
" $ lb config -k 486 -p minimal --apt-indices false \\\n"
@@ -631,12 +644,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:230
+#: en/user_examples.ssi:238
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:246
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 "
@@ -644,7 +657,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:248
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 "
@@ -662,18 +675,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:250
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:252
#, 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:246
+#: en/user_examples.ssi:254
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 "
@@ -681,7 +694,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:256
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 "
@@ -691,18 +704,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:260
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:264
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:269
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -710,14 +723,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:273
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:271
+#: en/user_examples.ssi:279
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -726,7 +739,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:275
+#: en/user_examples.ssi:283
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, "
@@ -736,7 +749,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:289
+#: en/user_examples.ssi:297
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -753,7 +766,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:292
+#: en/user_examples.ssi:300
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_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index b85adf5..4c08186 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-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-07-19 03:36+0300\n"
"PO-Revision-Date: 2010-10-13 17:00+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:60
#: 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
@@ -61,19 +60,19 @@ msgstr ""
#: 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: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_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_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
@@ -91,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:64
#: 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
@@ -132,19 +130,19 @@ msgstr "code{"
#: 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: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_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_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
@@ -296,7 +294,7 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:58
#, no-wrap
-msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
+msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index b57108c..c337bfb 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-06-27 14:57+0300\n"
+"POT-Creation-Date: 2012-07-27 00:01+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-06-27\n"
+" :published: 2012-07-27\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/project_bugs.ssi.pot b/manual/pot/project_bugs.ssi.pot
index 60d3da5..7bb9a2b 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-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-07-21 03: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"
@@ -17,11 +17,10 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: 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: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
@@ -61,19 +60,19 @@ msgstr ""
#: 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: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
@@ -88,11 +87,10 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: 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: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
@@ -132,19 +130,19 @@ msgstr ""
#: 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: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
@@ -193,15 +191,15 @@ msgstr ""
#: en/project_bugs.ssi:12
msgid ""
"_* Always try to reproduce the bug with the *{most recent versions}* of live-"
-"build, live-boot, and live-config before submitting a bug report."
+"build, live-boot, live-config and live-tools before submitting a bug report."
msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:14
msgid ""
"_* Try to give *{as specific information as possible}* about the bug. This "
-"includes (at least) the version of live-build, live-boot, and live-config "
-"used and the distribution of the live system you are building."
+"includes (at least) the version of live-build, live-boot, live-config, and "
+"live-tools used and the distribution of the live system you are building."
msgstr ""
#. type: Plain text
@@ -317,27 +315,32 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:50
+msgid "_* Version of live-tools on the live system"
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:52
msgid ""
"_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:52
+#: en/project_bugs.ssi:54
msgid "_* Architecture of the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:54
+#: en/project_bugs.ssi:56
msgid "_* Distribution of the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:56
+#: en/project_bugs.ssi:58
msgid "_* Version of the kernel on the live system"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:58
+#: 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 "
@@ -345,20 +348,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:62
+#: en/project_bugs.ssi:64 en/user_examples.ssi:42 en/user_examples.ssi:69
+#: en/user_examples.ssi:242
#, no-wrap
msgid " # lb build 2>&1 | tee build.log\n"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:66
-msgid ""
-"At boot time, live-boot stores a log in #{/var/log/live.log}# (or #{/var/log/"
-"live-boot.log}#)."
+#: en/project_bugs.ssi:68
+msgid "At boot time, live-boot stores a log in #{/var/log/live-boot.log}#."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:68
+#: en/project_bugs.ssi:70
msgid ""
"Additionally, to rule out other errors, it is always a good idea to tar up "
"your #{config/}# directory and upload it somewhere (do *{not}* send it as an "
@@ -370,7 +372,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:70
+#: en/project_bugs.ssi:72
msgid ""
"Remember to send in any logs that were produced with English locale "
"settings, e.g. run your live-build commands with a leading #{LC_ALL=C}# or #"
@@ -378,12 +380,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:72
+#: en/project_bugs.ssi:74
msgid "2~ Isolate the failing case if possible"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:74
+#: 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 "
@@ -397,22 +399,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:76
+#: en/project_bugs.ssi:78
msgid "2~ Use the correct package to report the bug against"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:78
-msgid "Where does the bug appear?"
+#: 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."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:80
+#: en/project_bugs.ssi:82
+msgid ""
+"However, we would appreciate if you try to narrow it down according to where "
+"the bug appears."
+msgstr ""
+
+#. type: Plain text
+#: en/project_bugs.ssi:84
msgid "3~ At build time whilst bootstrapping"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:82
+#: en/project_bugs.ssi:86
msgid ""
"live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
"{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
@@ -422,7 +434,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:84
+#: 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 "
@@ -430,12 +442,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:86
+#: en/project_bugs.ssi:90
msgid "3~ At build time whilst installing packages"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:88
+#: en/project_bugs.ssi:92
msgid ""
"live-build installs additional packages from the Debian archive and "
"depending on the Debian distribution used and the daily archive state, it "
@@ -444,7 +456,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:90
+#: en/project_bugs.ssi:94
msgid ""
"If this is the case, this is not a bug in Debian Live, but rather in Debian "
"- please report it against the failing package. Running /{debootstrap}/ "
@@ -453,7 +465,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:92
+#: 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 "
@@ -461,12 +473,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:94
+#: en/project_bugs.ssi:98
msgid "3~ At boot time"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:96
+#: en/project_bugs.ssi:100
msgid ""
"If your image does not boot, please report it to the mailing list together "
"with the information requested in {Collect information}#collect-information. "
@@ -477,24 +489,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:98
+#: en/project_bugs.ssi:102
msgid "3~ At run time"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:100
+#: 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,"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:102
+#: en/project_bugs.ssi:106
msgid "2~ Do the research"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:104
+#: en/project_bugs.ssi:108
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 "
@@ -504,7 +516,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:106
+#: en/project_bugs.ssi:110
msgid ""
"You should pay particular attention to the Debian Live mailing list, as well "
"as the homepage, as these are likely to contain the most up-to-date "
@@ -513,20 +525,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:108
+#: en/project_bugs.ssi:112
msgid ""
"In addition, you should check the current bug lists for live-build, live-"
-"boot, and live-config to see whether something similar has been reported "
-"already."
+"boot, live-config and live-tools to see whether something similar has been "
+"reported already."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:110
+#: en/project_bugs.ssi:114
msgid "2~ Where to report bugs"
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:112
+#: en/project_bugs.ssi:116
msgid ""
"The Debian Live project keeps track of all bugs in the Debian Bug Tracking "
"System (BTS). For information on how to use the system, please see http://"
@@ -535,17 +547,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:114
+#: en/project_bugs.ssi:118
msgid ""
"In general, you should report build time errors against the live-build "
"package, boot time errors against live-boot, and run time errors against "
"live-config. If you are unsure of which package is appropriate or need more "
-"help before submitting a bug report, please send a message to the mailing "
-"list and we will help you to figure it out."
+"help before submitting a bug report, please report it against the debian-"
+"live pseudo-package. We will then take care about it and reassign it where "
+"appropriate."
msgstr ""
#. type: Plain text
-#: en/project_bugs.ssi:115
+#: en/project_bugs.ssi:119
msgid ""
"Please note that bugs found in distributions derived from Debian (such as "
"Ubuntu and others) should *{not}* be reported to the Debian BTS unless they "
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 01f2345..051f4de 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-06-03 19:00+0300\n"
+"POT-Creation-Date: 2012-07-18 19: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"
@@ -60,19 +60,19 @@ msgstr ""
#: 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: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_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_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
@@ -130,19 +130,19 @@ msgstr ""
#: 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: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_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_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
@@ -281,7 +281,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:34 en/user_examples.ssi:109
#, no-wrap
msgid " $ lb config\n"
msgstr ""
@@ -303,7 +303,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:170 en/user_basics.ssi:238
-#: en/user_examples.ssi:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -750,8 +750,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
msgid ""
-"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
-"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"For example, if you unpack the generated #{binary.netboot.tar.xz}# archive "
+"in the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
"in #{tftpboot/debian-live/i386}#."
msgstr ""
diff --git a/manual/pot/user_customization-runtime.ssi.pot b/manual/pot/user_customization-runtime.ssi.pot
index 6a075f6..9ed0b42 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-06-09 20:31+0300\n"
+"POT-Creation-Date: 2012-07-21 03: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
@@ -60,19 +60,19 @@ msgstr ""
#: 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-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
@@ -90,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
@@ -130,19 +130,19 @@ msgstr ""
#: 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-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
@@ -235,7 +235,7 @@ msgid ""
"One possible way of changing the default password is by means of a hook as "
"described in {Boot-time hooks}#boot-time-hooks. In order to do that you can "
"use the \"passwd\" hook from #{/usr/share/doc/live-config/examples/hooks}#, "
-"prefix it accordingly (e.g. 200-passwd) and add it to #{config/includes."
+"prefix it accordingly (e.g. 2000-passwd) and add it to #{config/includes."
"chroot/lib/live/config/}#"
msgstr ""
@@ -246,7 +246,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:37
-msgid "When the live system boots, language is involved in three steps:"
+msgid "When the live system boots, language is involved in two steps:"
msgstr ""
#. type: Plain text
@@ -256,108 +256,130 @@ msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:41
-msgid "_* setting the keyboard layout for the console"
+msgid "_* setting the keyboard configuration"
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:43
-msgid "_* setting the keyboard layout for X"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-runtime.ssi:45
msgid ""
-"The default locale when building a Live system is \"locales=en_US.UTF-8\". "
+"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."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:49
+#: en/user_customization-runtime.ssi:47
#, no-wrap
msgid " $ lb config --bootappend-live \"locales=de_CH.UTF-8\"\n"
msgstr ""
#. type: Plain text
+#: en/user_customization-runtime.ssi:51
+msgid "Multiple locales may be specified as a comma-delimited list."
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-runtime.ssi:53
msgid ""
-"This parameter can also be used at the kernel command line. You can specify "
-"a locale by a full #{language_country.encoding}# word."
+"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}#."
msgstr ""
#. type: Plain text
#: en/user_customization-runtime.ssi:55
msgid ""
-"Both the console and X keyboard configuration depend on the #{keyboard-"
-"layouts}# parameter of the #{--bootappend-live}# option. Valid options for X "
-"keyboard layouts can be found in #{/usr/share/X11/xkb/rules/base.xml}# "
-"(rather limited to two-letters country codes). To find the value (the two "
-"characters) corresponding to a language try searching for the english name "
-"of the nation 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-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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:60
+#: en/user_customization-runtime.ssi:68
#, no-wrap
msgid ""
-" $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name\n"
-" <name>se</name>\n"
+"$ 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:64
+#: en/user_customization-runtime.ssi:72
msgid ""
-"To get the locale files for German and Swiss German keyboard layout in X use:"
+"Note that each variant lists the layout to which it applies in the "
+"description."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:68
+#: en/user_customization-runtime.ssi:74
+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 ""
+
+#. 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 ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:72
+#: en/user_customization-runtime.ssi:82
msgid ""
-"A list of the valid values of the keyboards for the console can be figured "
-"with the following command:"
+"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:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:77
+#: en/user_customization-runtime.ssi:87
#, no-wrap
msgid ""
-" $ for i in $(find /usr/share/keymaps/ -iname \"*kmap.gz\"); \\\n"
-" do basename $i | head -c -9; echo; done | sort | less\n"
+" $ lb config --bootappend-live \\\n"
+" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:81
+#: en/user_customization-runtime.ssi:91
msgid ""
-"Alternatively, you can use the #{console-setup}# package, a tool to let you "
-"configure console layout using X (XKB) definitions; you can then set your "
-"keyboard layout more precisely with #{keyboard-layouts}#, #{keyboard-variant}"
-"#, #{keyboard-options}# and #{keyboard-model}# variables; live-boot will use "
-"also these parameters for X configuration. For example, to set up a French "
-"system with a French-Dvorak layout (called Bepo) on a TypeMatrix keyboard, "
-"both in console and X11, 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-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 ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:86
+#: en/user_customization-runtime.ssi:96
#, no-wrap
msgid ""
" $ lb config --bootappend-live \\\n"
-" \"locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb\"\n"
+" \"keyboard-layouts=us,us keyboard-variant=,dvorak\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:90
+#: en/user_customization-runtime.ssi:100
msgid "2~persistence Persistence"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:92
+#: en/user_customization-runtime.ssi:102
msgid ""
"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 "
@@ -365,7 +387,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:94
+#: en/user_customization-runtime.ssi:104
msgid ""
"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 "
@@ -374,7 +396,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:96
+#: en/user_customization-runtime.ssi:106
msgid ""
"'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 "
@@ -385,7 +407,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:98
+#: en/user_customization-runtime.ssi:108
msgid ""
"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 "
@@ -395,7 +417,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:100
+#: en/user_customization-runtime.ssi:110
msgid ""
"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 "
@@ -405,17 +427,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:102
+#: en/user_customization-runtime.ssi:112
msgid "_* a partition, identified by its GPT name."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:104
+#: en/user_customization-runtime.ssi:114
msgid "_* a filesystem, identified by its filesystem label."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:116
msgid ""
"_* 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 "
@@ -424,7 +446,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:108
+#: en/user_customization-runtime.ssi:118
msgid ""
"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-"
@@ -433,7 +455,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:110
+#: en/user_customization-runtime.ssi:120
msgid ""
"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 "
@@ -441,38 +463,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:114
+#: en/user_customization-runtime.ssi:124
#, no-wrap
msgid " # mkfs.ext4 -L persistence /dev/sdb1\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:118
+#: en/user_customization-runtime.ssi:128
msgid "See also {Using the space left on a USB stick}#using-usb-extra-space."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:120
+#: en/user_customization-runtime.ssi:130
msgid ""
"If you already have a partition on your device, you could just change the "
"label with one of the following:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:124
+#: en/user_customization-runtime.ssi:134
#, no-wrap
-msgid " $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
+msgid " # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:128
+#: en/user_customization-runtime.ssi:138
msgid ""
"Here's an example of how to create an ext4-based image file used for "
"persistence:"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:133
+#: en/user_customization-runtime.ssi:143
#, no-wrap
msgid ""
" $ dd if=/dev/null of=persistence bs=1G seek=1 # for a 1GB sized image file\n"
@@ -480,17 +502,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:137
+#: en/user_customization-runtime.ssi:147
msgid "Then copy the #{persistence}# file to the root of a writable partition."
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:139
+#: en/user_customization-runtime.ssi:149
msgid "3~live-persistence-conf The live-persistence.conf file"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:141
+#: en/user_customization-runtime.ssi:151
msgid ""
"A volume with the label #{persistence}# can be configured to make arbitrary "
"directories persistent. The file #{live-persistence.conf}#, located on the "
@@ -499,7 +521,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:143
+#: en/user_customization-runtime.ssi:153
msgid ""
"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 "
@@ -508,17 +530,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:150
+#: en/user_customization-runtime.ssi:160
#, no-wrap
msgid ""
-" $ 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"
+" # 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"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:154
+#: en/user_customization-runtime.ssi:164
msgid ""
"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 "
@@ -530,7 +552,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:156
+#: en/user_customization-runtime.ssi:166
msgid ""
"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 "
@@ -543,18 +565,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:158
-msgid "3~ Persistence SubText"
+#: en/user_customization-runtime.ssi:168
+msgid "3~ Using more than one persistence store"
msgstr ""
#. type: Plain text
-#: en/user_customization-runtime.ssi:159
+#: en/user_customization-runtime.ssi:169
msgid ""
-"If a user would need multiple persistence storage of the same type for "
+"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-subtext}# used in "
+"{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-subtext=subText}#."
+"boot parameters of: #{persistence}# #{persistence-label=subText}#."
msgstr ""
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index d44e4f8..bb72093 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-06-07 08:43+0300\n"
+"POT-Creation-Date: 2012-07-19 03:36+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"
@@ -65,19 +65,19 @@ msgstr ""
#: 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: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_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_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
@@ -135,19 +135,19 @@ msgstr ""
#: 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: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_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_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
@@ -163,14 +163,20 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:62 en/user_examples.ssi:42 en/user_examples.ssi:69
-#: en/user_examples.ssi:234
+#: en/user_examples.ssi:242
#, 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
+#, 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:119 en/user_examples.ssi:211
+#: en/user_examples.ssi:127 en/user_examples.ssi:219
#, no-wrap
msgid " # lb build\n"
msgstr ""
@@ -371,7 +377,7 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p tutorial3/auto\n"
-" $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/\n"
+" $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/\n"
" $ cd tutorial3\n"
msgstr ""
@@ -393,17 +399,24 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:105
+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
msgid "Now populate your local package list:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:109
+#: en/user_examples.ssi:117
#, no-wrap
msgid " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:113
+#: en/user_examples.ssi:121
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 #"
@@ -414,19 +427,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:115
+#: en/user_examples.ssi:123
msgid "Now, build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:123
+#: en/user_examples.ssi:131
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:125
+#: en/user_examples.ssi:133
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 "
@@ -434,7 +447,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:131
+#: en/user_examples.ssi:139
#, no-wrap
msgid ""
" $ git init\n"
@@ -443,19 +456,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:135
+#: en/user_examples.ssi:143
msgid "3~ Second revision"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:137
+#: en/user_examples.ssi:145
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:139
+#: en/user_examples.ssi:147
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 "
@@ -464,47 +477,47 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:143
+#: en/user_examples.ssi:151
#, no-wrap
msgid " # lb clean\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:147
+#: en/user_examples.ssi:155
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:151
+#: en/user_examples.ssi:159
#, no-wrap
msgid " $ echo vlc >> config/package-lists/my.list.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:155
+#: en/user_examples.ssi:163
msgid "Build again:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:159
+#: en/user_examples.ssi:167
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:163
+#: en/user_examples.ssi:171
msgid "Test, and when you're satisfied, commit the next revision:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:167
+#: en/user_examples.ssi:175
#, no-wrap
msgid " $ git commit -a -m \"Adding vlc media player.\"\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:171
+#: en/user_examples.ssi:179
msgid ""
"Of course, more complicated changes to the configuration are possible, "
"perhaps adding files in subdirectories of #{config/}#. When you commit new "
@@ -515,7 +528,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:173
+#: en/user_examples.ssi:181
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 "
@@ -525,18 +538,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:175
+#: en/user_examples.ssi:183
msgid "2~ A VNC Kiosk Client"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:177
+#: en/user_examples.ssi:185
#, 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:179
+#: en/user_examples.ssi:187
msgid ""
"Make a build directory and create a skeletal configuration in it built "
"around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
@@ -544,7 +557,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:187
+#: en/user_examples.ssi:195
#, no-wrap
msgid ""
" $ mkdir vnc_kiosk_client\n"
@@ -555,7 +568,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:191
+#: en/user_examples.ssi:199
msgid ""
"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
"the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
@@ -563,7 +576,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:197
+#: en/user_examples.ssi:205
#, no-wrap
msgid ""
" $ mkdir -p config/includes.chroot/etc/skel\n"
@@ -572,7 +585,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:200
+#: en/user_examples.ssi:208
#, no-wrap
msgid ""
" /usr/bin/metacity &\n"
@@ -580,7 +593,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:211
#, no-wrap
msgid ""
" exit\n"
@@ -588,28 +601,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:215
msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:223
msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:217
+#: en/user_examples.ssi:225
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:219
+#: 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"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:221
+#: en/user_examples.ssi:229
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 "
@@ -623,7 +636,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:226
+#: en/user_examples.ssi:234
#, no-wrap
msgid ""
" $ lb config -k 486 -p minimal --apt-indices false \\\n"
@@ -631,12 +644,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:230
+#: en/user_examples.ssi:238
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:238
+#: en/user_examples.ssi:246
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 "
@@ -644,7 +657,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:240
+#: en/user_examples.ssi:248
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 "
@@ -662,18 +675,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:242
+#: en/user_examples.ssi:250
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:244
+#: en/user_examples.ssi:252
#, 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:246
+#: en/user_examples.ssi:254
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 "
@@ -681,7 +694,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:248
+#: en/user_examples.ssi:256
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 "
@@ -691,18 +704,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:252
+#: en/user_examples.ssi:260
#, no-wrap
msgid " # apt-get install dctrl-tools tasksel-data\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:256
+#: en/user_examples.ssi:264
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:269
#, no-wrap
msgid ""
" $ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -710,14 +723,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:273
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:271
+#: en/user_examples.ssi:279
#, no-wrap
msgid ""
" $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/descs/debian-tasks.desc -sTask\n"
@@ -726,7 +739,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:275
+#: en/user_examples.ssi:283
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, "
@@ -736,7 +749,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:289
+#: en/user_examples.ssi:297
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -753,7 +766,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:292
+#: en/user_examples.ssi:300
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_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index 2750197..cf4e129 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-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-07-19 03:36+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:60
#: 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
@@ -61,19 +60,19 @@ msgstr ""
#: 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: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_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_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
@@ -91,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:64
#: 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
@@ -132,19 +130,19 @@ msgstr ""
#: 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: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_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_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
@@ -296,7 +294,7 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:58
#, no-wrap
-msgid " $ cp /usr/share/live/build/examples/auto/* auto/\n"
+msgid " $ cp /usr/share/doc/live-build/examples/auto/* auto/\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 4137e6e..769bda2 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2012-06-27
+ :published: 27-07-2012
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/project_bugs.ssi b/manual/pt_BR/project_bugs.ssi
index a051509..eec3466 100644
--- a/manual/pt_BR/project_bugs.ssi
+++ b/manual/pt_BR/project_bugs.ssi
@@ -13,11 +13,12 @@ _* Always check first the image status updates on our homepage at
http://live.debian.net/ for known issues.
_* Always try to reproduce the bug with the *{most recent versions}* of
-live-build, live-boot, and live-config before submitting a bug report.
+live-build, live-boot, live-config and live-tools before submitting a bug
+report.
_* Try to give *{as specific information as possible}* about the bug. This
-includes (at least) the version of live-build, live-boot, and live-config
-used and the distribution of the live system you are building.
+includes (at least) the version of live-build, live-boot, live-config, and
+live-tools used and the distribution of the live system you are building.
2~ Known issues
@@ -71,6 +72,8 @@ _* Version of live-boot on the live system
_* Version of live-config on the live system
+_* Version of live-tools on the live system
+
_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
_* Architecture of the live system
@@ -89,8 +92,7 @@ code{
}code
-At boot time, live-boot stores a log in #{/var/log/live.log}# (or
-#{/var/log/live-boot.log}#).
+At boot time, live-boot stores a log in #{/var/log/live-boot.log}#.
Additionally, to rule out other errors, it is always a good idea to tar up
your #{config/}# directory and upload it somewhere (do *{not}* send it as an
@@ -118,7 +120,12 @@ increments.
2~ Use the correct package to report the bug against
-Where does the bug appear?
+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.
+
+However, we would appreciate if you try to narrow it down according to where
+the bug appears.
3~ At build time whilst bootstrapping
@@ -177,8 +184,8 @@ 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, and live-config to see whether something similar has been
-reported already.
+live-boot, live-config and live-tools to see whether something similar has
+been reported already.
2~ Where to report bugs
@@ -190,8 +197,9 @@ http://bugs.debian.org/. You can also submit the bugs by using the
In general, you should report build time errors against the live-build
package, boot time errors against live-boot, and run time errors against
live-config. If you are unsure of which package is appropriate or need more
-help before submitting a bug report, please send a message to the mailing
-list and we will help you to figure it out.
+help before submitting a bug report, please report it against the
+debian-live pseudo-package. We will then take care about it and reassign it
+where appropriate.
Please note that bugs found in distributions derived from Debian (such as
Ubuntu and others) should *{not}* be reported to the Debian BTS unless they
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index 05401eb..eddcc0b 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -358,8 +358,8 @@ next step is getting a higher level bootloader via the TFTP protocol. That
could be pxelinux, GRUB, or even boot directly to an operating system like
Linux.
-For example, if you unpack the generated #{binary-net.tar.gz}# archive in
-the #{/srv/debian-live}# directory, you'll find the filesystem image in
+For example, if you unpack the generated #{binary.netboot.tar.xz}# archive
+in the #{/srv/debian-live}# directory, you'll find the filesystem image in
#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
in #{tftpboot/debian-live/i386}#.
diff --git a/manual/pt_BR/user_customization-runtime.ssi b/manual/pt_BR/user_customization-runtime.ssi
index 5d83783..47d89df 100644
--- a/manual/pt_BR/user_customization-runtime.ssi
+++ b/manual/pt_BR/user_customization-runtime.ssi
@@ -44,22 +44,21 @@ 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. 200-passwd) and add it to
+prefix it accordingly (e.g. 2000-passwd) and add it to
#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Customizing locale and language
-When the live system boots, language is involved in three steps:
+When the live system boots, language is involved in two steps:
_* the locale generation
-_* setting the keyboard layout for the console
+_* setting the keyboard configuration
-_* setting the keyboard layout for X
-
-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.
+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.
code{
@@ -67,26 +66,43 @@ code{
}code
-This parameter can also be used at the kernel command line. You can specify
-a locale by a full #{language_country.encoding}# word.
+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 depend on the
-#{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid
-options for X keyboard layouts can be found in
-#{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country
-codes). To find the value (the two characters) corresponding to a language
-try searching for the english name of the nation 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-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:
code{
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-To get the locale files for German and Swiss German keyboard layout in X
-use:
+Note that each variant lists the layout to which it applies in the
+description.
+
+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:
code{
@@ -94,28 +110,31 @@ code{
}code
-A list of the valid values of the keyboards for the console can be figured
-with the following command:
+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:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live \
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
}code
-Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then set your
-keyboard layout more precisely with #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
-live-boot will use also these parameters for X configuration. For example,
-to set up a French system with a French-Dvorak layout (called Bepo) on a
-TypeMatrix keyboard, both in console and X11, 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-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:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "keyboard-layouts=us,us keyboard-variant=,dvorak"
}code
@@ -180,7 +199,7 @@ label with one of the following:
code{
- $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
+ # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
}code
@@ -210,10 +229,10 @@ persistent in an ext4 filesystem on the /dev/sdb1 partition:
code{
- $ mkfs.ext4 -L persistence /dev/sdb1
- $ mount -t ext4 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live-persistence.conf
- $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
+ # mkfs.ext4 -L persistence /dev/sdb1
+ # mount -t ext4 /dev/sdb1 /mnt
+ # echo "/home" >> /mnt/live-persistence.conf
+ # echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
@@ -235,12 +254,12 @@ 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~ Persistence SubText
+3~ Using more than one persistence store
-If a user would need multiple persistence storage of the same type for
+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-subtext}# used in
+#{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-subtext=subText}#.
+boot parameters of: #{persistence}# #{persistence-label=subText}#.
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 2108b14..f506833 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -119,7 +119,7 @@ in {Managing a configuration}#managing-a-configuration.
code{
$ mkdir -p tutorial3/auto
- $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/
$ cd tutorial3
}code
@@ -138,6 +138,15 @@ code{
}code
+Perform #{lb config}# to generate the config tree, using the #{auto/config}#
+script you just created:
+
+code{
+
+ $ lb config
+
+}code
+
Now populate your local package list:
code{
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index 6deb8ad..a79f060 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -83,7 +83,7 @@ above. You may copy those as your starting point.
code{
- $ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
}code
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index 2470e22..8217fa8 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -16,9 +16,9 @@ be specified at the boot prompt, such as selecting a keyboard layout and
locale, and using persistence.
Anumite comenzi din text trebuie sa fie executate ca 'super_utilizator',
-privilegiu care poate fi obtinut fie prin comanda #{su}, sau #{sudo}. Pentru
-a distinge intre acesti utilizatori se vor folosi #{$}# respectiv #{#}#
-. Aceste simboluri nu fac parte din comenzi.
+privilegiu care poate fi obtinut fie prin comanda #{su}#, sau
+#{sudo}#. Pentru a distinge intre acesti utilizatori se vor folosi #{$}#
+respectiv #{#}# . Aceste simboluri nu fac parte din comenzi.
2~ For the impatient
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 4137e6e..7b2ef63 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -1,17 +1,17 @@
% SiSU 2.0
- at title: Debian Live Manual
+ at title: Manualul Debian Live
- at creator: Debian Live Project <debian-live at lists.debian.org>
+ at creator: Proiectul Debian Live <debian-live at lists.debian.org>
@rights:
:copyright: Copyright (C) 2006-2012 Debian Live Project
- :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.
+ :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: 2012-06-27
+ :published: 27.07.2012
- at publisher: Debian Live Project <debian-live at lists.debian.org>
+ at publisher: Proiectul Debian Live <debian-live at lists.debian.org>
@make:
:bold: /squeeze|wheezy|sid/
@@ -21,13 +21,13 @@
:A~ @title
-:B~ About
+:B~ Despre
<< about_manual.ssi
<< about_project.ssi
-:B~ User
+:B~ Utilizator
<< user_installation.ssi
@@ -49,7 +49,7 @@
<< user_customization-installer.ssi
-:B~ Project
+:B~ Proiect
<< project_bugs.ssi
@@ -57,10 +57,10 @@
<< project_procedures.ssi
-:B~ Examples
+:B~ Exemple
<< user_examples.ssi
-:B~ Appendix
+:B~ Anexă
<< style_guide.ssi
diff --git a/manual/ro/project_bugs.ssi b/manual/ro/project_bugs.ssi
index a051509..eec3466 100644
--- a/manual/ro/project_bugs.ssi
+++ b/manual/ro/project_bugs.ssi
@@ -13,11 +13,12 @@ _* Always check first the image status updates on our homepage at
http://live.debian.net/ for known issues.
_* Always try to reproduce the bug with the *{most recent versions}* of
-live-build, live-boot, and live-config before submitting a bug report.
+live-build, live-boot, live-config and live-tools before submitting a bug
+report.
_* Try to give *{as specific information as possible}* about the bug. This
-includes (at least) the version of live-build, live-boot, and live-config
-used and the distribution of the live system you are building.
+includes (at least) the version of live-build, live-boot, live-config, and
+live-tools used and the distribution of the live system you are building.
2~ Known issues
@@ -71,6 +72,8 @@ _* Version of live-boot on the live system
_* Version of live-config on the live system
+_* Version of live-tools on the live system
+
_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
_* Architecture of the live system
@@ -89,8 +92,7 @@ code{
}code
-At boot time, live-boot stores a log in #{/var/log/live.log}# (or
-#{/var/log/live-boot.log}#).
+At boot time, live-boot stores a log in #{/var/log/live-boot.log}#.
Additionally, to rule out other errors, it is always a good idea to tar up
your #{config/}# directory and upload it somewhere (do *{not}* send it as an
@@ -118,7 +120,12 @@ increments.
2~ Use the correct package to report the bug against
-Where does the bug appear?
+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.
+
+However, we would appreciate if you try to narrow it down according to where
+the bug appears.
3~ At build time whilst bootstrapping
@@ -177,8 +184,8 @@ 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, and live-config to see whether something similar has been
-reported already.
+live-boot, live-config and live-tools to see whether something similar has
+been reported already.
2~ Where to report bugs
@@ -190,8 +197,9 @@ http://bugs.debian.org/. You can also submit the bugs by using the
In general, you should report build time errors against the live-build
package, boot time errors against live-boot, and run time errors against
live-config. If you are unsure of which package is appropriate or need more
-help before submitting a bug report, please send a message to the mailing
-list and we will help you to figure it out.
+help before submitting a bug report, please report it against the
+debian-live pseudo-package. We will then take care about it and reassign it
+where appropriate.
Please note that bugs found in distributions derived from Debian (such as
Ubuntu and others) should *{not}* be reported to the Debian BTS unless they
diff --git a/manual/ro/style_guide.ssi b/manual/ro/style_guide.ssi
index edd8e20..efc26c8 100644
--- a/manual/ro/style_guide.ssi
+++ b/manual/ro/style_guide.ssi
@@ -1,4 +1,4 @@
-:B~ Appendix
+:B~ Anexă
1~style-guide Style guide
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index 05401eb..eddcc0b 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -358,8 +358,8 @@ next step is getting a higher level bootloader via the TFTP protocol. That
could be pxelinux, GRUB, or even boot directly to an operating system like
Linux.
-For example, if you unpack the generated #{binary-net.tar.gz}# archive in
-the #{/srv/debian-live}# directory, you'll find the filesystem image in
+For example, if you unpack the generated #{binary.netboot.tar.xz}# archive
+in the #{/srv/debian-live}# directory, you'll find the filesystem image in
#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
in #{tftpboot/debian-live/i386}#.
diff --git a/manual/ro/user_customization-runtime.ssi b/manual/ro/user_customization-runtime.ssi
index 5d83783..47d89df 100644
--- a/manual/ro/user_customization-runtime.ssi
+++ b/manual/ro/user_customization-runtime.ssi
@@ -44,22 +44,21 @@ 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. 200-passwd) and add it to
+prefix it accordingly (e.g. 2000-passwd) and add it to
#{config/includes.chroot/lib/live/config/}#
2~customizing-locale-and-language Customizing locale and language
-When the live system boots, language is involved in three steps:
+When the live system boots, language is involved in two steps:
_* the locale generation
-_* setting the keyboard layout for the console
+_* setting the keyboard configuration
-_* setting the keyboard layout for X
-
-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.
+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.
code{
@@ -67,26 +66,43 @@ code{
}code
-This parameter can also be used at the kernel command line. You can specify
-a locale by a full #{language_country.encoding}# word.
+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 depend on the
-#{keyboard-layouts}# parameter of the #{--bootappend-live}# option. Valid
-options for X keyboard layouts can be found in
-#{/usr/share/X11/xkb/rules/base.xml}# (rather limited to two-letters country
-codes). To find the value (the two characters) corresponding to a language
-try searching for the english name of the nation 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-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:
code{
- $ grep -i sweden -C3 /usr/share/X11/xkb/rules/base.xml | grep name
- <name>se</name>
+$ egrep -i '(^!|german.*switzerland)' /usr/share/X11/xkb/rules/base.lst
+ ! model
+ ! layout
+ ch German (Switzerland)
+ ! variant
+ legacy ch: German (Switzerland, legacy)
+ de_nodeadkeys ch: German (Switzerland, eliminate dead keys)
+ de_sundeadkeys ch: German (Switzerland, Sun dead keys)
+ de_mac ch: German (Switzerland, Macintosh)
+ ! option
}code
-To get the locale files for German and Swiss German keyboard layout in X
-use:
+Note that each variant lists the layout to which it applies in the
+description.
+
+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:
code{
@@ -94,28 +110,31 @@ code{
}code
-A list of the valid values of the keyboards for the console can be figured
-with the following command:
+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:
code{
- $ for i in $(find /usr/share/keymaps/ -iname "*kmap.gz"); \
- do basename $i | head -c -9; echo; done | sort | less
+ $ lb config --bootappend-live \
+ "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
}code
-Alternatively, you can use the #{console-setup}# package, a tool to let you
-configure console layout using X (XKB) definitions; you can then set your
-keyboard layout more precisely with #{keyboard-layouts}#,
-#{keyboard-variant}#, #{keyboard-options}# and #{keyboard-model}# variables;
-live-boot will use also these parameters for X configuration. For example,
-to set up a French system with a French-Dvorak layout (called Bepo) on a
-TypeMatrix keyboard, both in console and X11, 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-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:
code{
$ lb config --bootappend-live \
- "locales=fr_FR.UTF-8 keyboard-layouts=fr keyboard-variant=bepo keyboard-model=tm2030usb"
+ "keyboard-layouts=us,us keyboard-variant=,dvorak"
}code
@@ -180,7 +199,7 @@ label with one of the following:
code{
- $ tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
+ # tune2fs -L persistence /dev/sdb1 # for ext2,3,4 filesystems
}code
@@ -210,10 +229,10 @@ persistent in an ext4 filesystem on the /dev/sdb1 partition:
code{
- $ mkfs.ext4 -L persistence /dev/sdb1
- $ mount -t ext4 /dev/sdb1 /mnt
- $ echo "/home" >> /mnt/live-persistence.conf
- $ echo "/var/cache/apt" >> /mnt/live-persistence.conf
+ # mkfs.ext4 -L persistence /dev/sdb1
+ # mount -t ext4 /dev/sdb1 /mnt
+ # echo "/home" >> /mnt/live-persistence.conf
+ # echo "/var/cache/apt" >> /mnt/live-persistence.conf
}code
@@ -235,12 +254,12 @@ 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~ Persistence SubText
+3~ Using more than one persistence store
-If a user would need multiple persistence storage of the same type for
+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-subtext}# used in
+#{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-subtext=subText}#.
+boot parameters of: #{persistence}# #{persistence-label=subText}#.
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 2108b14..e7bc9be 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -1,4 +1,4 @@
-:B~ Examples
+:B~ Exemple
1~examples Examples
@@ -119,7 +119,7 @@ in {Managing a configuration}#managing-a-configuration.
code{
$ mkdir -p tutorial3/auto
- $ cp /usr/share/live/build/examples/auto/* tutorial3/auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* tutorial3/auto/
$ cd tutorial3
}code
@@ -138,6 +138,15 @@ code{
}code
+Perform #{lb config}# to generate the config tree, using the #{auto/config}#
+script you just created:
+
+code{
+
+ $ lb config
+
+}code
+
Now populate your local package list:
code{
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index 6deb8ad..a79f060 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -83,7 +83,7 @@ above. You may copy those as your starting point.
code{
- $ cp /usr/share/live/build/examples/auto/* auto/
+ $ cp /usr/share/doc/live-build/examples/auto/* auto/
}code
--
live-manual
More information about the debian-live-changes
mailing list