[SCM] live-manual branch, debian-next, updated. debian/3.0_a11-1-29-g1a1503c

chals chals at altorricon.com
Sun Apr 8 13:32:05 UTC 2012


The following commit has been merged in the debian-next branch:
commit 1a1503ca96c0306e542ab8187fa7622d3db0695e
Author: chals <chals at altorricon.com>
Date:   Sun Apr 8 15:31:27 2012 +0200

    Updating markup in 'es' and 'fr'.

diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index d66ad78..aa006c7 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -205,7 +205,7 @@ See the man pages for more details.
 
 3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
 
-In order to test the ISO with #{virtualbox-ose}#:
+In order to test the ISO with /{virtualbox-ose}/:
 
 code{
 
@@ -218,7 +218,7 @@ code{
 Create a new virtual machine, change the storage settings to use
 #{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
 
-*{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.
+*{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.
 
 code{
 
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index cdb8cac..ba7a292 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -65,10 +65,10 @@ 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
+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.
 
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 64756f2..b155f23 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -287,7 +287,7 @@ a 128M media size, but without doing anything to destroy integrity of the
 packages contained within, such as the purging of locale data via the
 /{localepurge}/ package, or other such "intrusive" optimizations. Of
 particular note, you should not use #{--bootstrap-flavour minimal}# unless
-you really know what you're doing, as omitting priority #{important}#
+you really know what you're doing, as omitting priority *{important}*
 packages will most likely produce a broken live system.
 
 code{
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index f279a04..11927fa 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -122,7 +122,7 @@ See the man pages for more details.
 
 3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
 
-In order to test the ISO with #{virtualbox-ose}#:
+In order to test the ISO with /{virtualbox-ose}/:
 
 code{
 
@@ -134,7 +134,7 @@ code{
 
 Create a new virtual machine, change the storage settings to use #{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
 
-*{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.
+*{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.
 
 code{
 
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 7cb86c0..7282779 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -30,7 +30,7 @@ Experimental support is available for some Debian derivatives through a #{--mode
 
 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.
+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
 
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index fa24f19..2f5a644 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -217,7 +217,7 @@ Enjoy.
 
 *{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.
 
-When optimizing an image to fit a certain media size, you need to understand the tradeoffs you are making between size and functionality. In this example, we trim only so much as to make room for additional material within a 128M media size, but without doing anything to destroy integrity of the packages contained within, such as the purging of locale data via the /{localepurge}/ package, or other such "intrusive" optimizations. Of particular note, you should not use #{--bootstrap-flavour minimal}# unless you really know what you're doing, as omitting priority #{important}# packages will most likely produce a broken live system.
+When optimizing an image to fit a certain media size, you need to understand the tradeoffs you are making between size and functionality. In this example, we trim only so much as to make room for additional material within a 128M media size, but without doing anything to destroy integrity of the packages contained within, such as the purging of locale data via the /{localepurge}/ package, or other such "intrusive" optimizations. Of particular note, you should not use #{--bootstrap-flavour minimal}# unless you really know what you're doing, as omitting priority *{important}* packages will most likely produce a broken live system.
 
 code{
 
diff --git a/manual/es/about_manual.ssi b/manual/es/about_manual.ssi
index 9865ebe..c73e22d 100644
--- a/manual/es/about_manual.ssi
+++ b/manual/es/about_manual.ssi
@@ -81,9 +81,9 @@ _* *{live-boot}*: Es una colección de scripts que serán responsables de
 arrancar el sistema en vivo. live-boot fue anteriormente una parte del
 paquete live-initramfs.
 
-_* *{live-build}*: A collection of scripts used to build customized Debian
-Live systems. live-build was formerly known as /{live-helper}/, and even
-earlier known as /{live-package}/.
+_* *{live-build}*: Es una colección de scripts utilizados para construir
+sistemas Debian Live personalizados. live-build fue conocido anteriormente
+como /{live-helper}/, y en una versión anterior como /{live-package}/.
 
 _* *{live-config}*: Es una colección de scripts utilizados para configurar
 un sistema en vivo durante el proceso de arranque. live-config fue
@@ -100,9 +100,9 @@ arranque (bootloader) para modificar el comportamiento del kernel o del
 conjunto de scripts live-config. Son llamados también Parámetros de kernel u
 Opciones de arranque.
 
-_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run
-different instances of the GNU/Linux environment on a single system
-simultaneously without rebooting.
+_* *{chroot}*: El programa /{chroot}/, #{chroot(8)}#, permite ejecutar
+diferentes instancias de un entorno GNU/Linux en un solo sistema de manera
+simultánea sin necesidad de reiniciar el sistema.
 
 _* *{Imagen binaria}*: Es un fichero binario que contiene el sistema en
 vivo. Su nombre puede ser binary.iso o binary.img dependiendo de su formato.
diff --git a/manual/es/project_bugs.ssi b/manual/es/project_bugs.ssi
index 03f145c..f2f0c46 100644
--- a/manual/es/project_bugs.ssi
+++ b/manual/es/project_bugs.ssi
@@ -76,7 +76,7 @@ _* Versión de live-boot en el sistema en vivo.
 
 _* Versión de live-config en el sistema en vivo.
 
-_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
+_* Versión de /{debootstrap}/ y/o /{cdebootstrap}/ en el sistema anfitrión.
 
 _* Arquitectura del sistema en vivo.
 
@@ -130,11 +130,12 @@ más pequeños.
 
 3~ En la preinstalación (bootstrap) en tiempo de creación.
 
-live-build first bootstraps a basic Debian system with /{debootstrap}/ or
-/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
-distribution it is bootstrapping, it may fail. If a bug appears here, check
-if the error is related to a specific Debian package (most likely), or if it
-is related to bootstrapping tool itself.
+live-build arranca primero un sistema Debian básico con /{debootstrap}/ o
+/{cdebootstrap}/. Puede fallar dependiendo de la herramienta usada en la
+preinstalación y de la distribución Debian empleada. Si un error aparece en
+este momento, se debe comprobar si está relacionado con un paquete
+específico de Debian (es lo más probable), o si está relacionado con la
+herramienta de preinstalación en sí.
 
 En ambos casos, esto no es un error de Debian Live, sino de Debian en sí
 mismo, por lo cual el equipo de Debian Live no puede solucionarlo
@@ -148,10 +149,10 @@ fallar en función de la distribución Debian utilizada y del estado diario
 del archivo Debian. Se debe comprobar si el error es reproducible en un
 sistema Debian normal, si el fallo aparece en esta etapa.
 
-If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running /{debootstrap}/
-separately from the Live system build or running #{lb bootstrap --debug}#
-will give you more information.
+Si este es el caso, esto no es un error de Debian Live, sino de Debian - se
+debe informar sobre el paquete que falla. Se puede obtener más información
+ejecutando /{debootstrap}/ de forma separada del sistema de creación en vivo
+o ejecutando #{lb bootstrap --debug}#.
 
 Además, si se está utilizando una réplica local y/o cualquier tipo de proxy
 y se experimenta un problema, se debe intentar reproducir siempre
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index 1ef2355..402f5b0 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -226,7 +226,7 @@ Consultar las páginas del manual para más detalles.
 
 3~testing-iso-with-virtualbox  Probar una imagen ISO con virtualbox-ose
 
-Para probar una imagen ISO con #{virtualbox-ose}#:
+Para probar una imagen ISO con /{virtualbox-ose}/:
 
 code{
 
@@ -240,8 +240,7 @@ 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.
 
-*{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.
-
+*{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,8 +259,7 @@ BIOS no maneje adecuadamente las imágenes híbridas. También es interesante
 una imagen HDD si se desea utilizar el espacio restante en los medios de
 almacenamiento para una partición con persistencia.
 
-*{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):
-
+*{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
@@ -346,8 +344,7 @@ La siguiente secuencia de comandos creará una imagen de arranque en red
 básica que contendrá el sistema estándar de Debian sin X.org. Se puede usar
 para el arranque en red.
 
-*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
-
+*{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
diff --git a/manual/es/user_customization-installer.ssi b/manual/es/user_customization-installer.ssi
index f103f4d..4a19d4d 100644
--- a/manual/es/user_customization-installer.ssi
+++ b/manual/es/user_customization-installer.ssi
@@ -17,10 +17,10 @@ Principalmente existen tres tipos de imágenes según el instalador:
 
 *{Imágenes con Instalador Debian «official»}*: Esta imagen de Debian Live se puede considerar como la imagen habitual. Dispone de un kernel y un initrd diferenciados que, al ser seleccionados desde el gestor de arranque, ejecuta un Instalador de Debian estándar, de la misma manera que lo haría si se arrancase desde una imagen de CD descargada desde el sitio oficial de Debian. Las imágenes que contienen un sistema en vivo con otro instalador independiente se suelen llamar «imágenes combinadas».
 
-On such images, Debian is installed by fetching and installing .deb packages
-using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some
-network-based network, resulting in a standard Debian system being installed
-to the hard disk.
+En estas imágenes, el sistema operativo Debian se instala mediante la
+herramienta /{debootstrap}/ o /{cdebootstrap}/ que descarga paquetes .deb,
+desde medios locales o por red local, y los instala de forma tradicional. El
+resultado final es un sistema Debian estándar instalado en el disco duro.
 
 El conjunto de este proceso puede ser preconfigurado (preseeded) y
 personalizado de muchas maneras; Para más información, ver las páginas
@@ -30,18 +30,17 @@ encargarse de depositarlo en la imagen y activarlo de forma automática.
 
 *{Imágenes con Instalador Debian «Live»}*: Estas imágenes de Debian Live también disponen de un kernel y un initrd diferenciados que, al ser seleccionados desde el gestor de arranque, ejecutan un Instalador de Debian algo diferente.
 
-Installation will proceed in an identical fashion to the "Regular"
-installation described above, but at the actual package installation stage,
-instead of using /{debootstrap}/ to fetch and install packages, the live
-filesystem image is copied to the target. This is achieved with a special
-udeb called live-installer.
+El procedimiento de instalación es idéntico al realizado por las imagenes
+«Regulares» pero, en lugar de utilizar /{debootstrap}/ para obtener e
+instalar paquetes .deb, lo que hace es copiar al disco duro la imagen del
+sistema de ficheros que se había preparado para lanzar el sistema en
+vivo. Esto se logra mediante un .udeb especial llamado live-installer.
 
 Una vez finalizada esta etapa, el Instalador de Debian continua normalmente,
 instalando y configurando los siguientes elementos como pueden ser gestor de
 arranque, creación de usuarios locales, etc.
 
-*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
-
+*{Nota:}* Para poder arrancar los dos tipos de imágenes, Regular y Live, en el mismo medio, el gestor de arranque debe poder deshabilitar live-installer. Esto se hace utilizando la variable de preconfiguración (preseed) #{live-installer/enable=false}#.
 *{Instalador Debian «del escritorio»}*: Una vez el sistema en vivo está ejecutandose, se puede lanzar el Instalador de Debian haciendo clic en el icono correspondiente, sin importar el tipo de Instalador Debian utilizado en el arranque. Esta manera de instalar Debian es más sencilla para el usuario y aconsejable en algunas situaciones. Para poder realizar esta acción se debe instalar el paquete debian-installer-launcher.
 
 Por defecto, live-build no incluye las imágenes que utilizan el Instalador
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index 84f585e..73d8fe6 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -27,15 +27,16 @@ algunas posibilidades.
 
 3~ Distribución, áreas de archivo y modo
 
-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:
+La distribución seleccionada tiene gran impacto en qué paquetes están
+disponibles para incluir en la imagen. Se debe indicar el nombre en clave de
+la distribución, que por defecto es #{wheezy}# para la versión Wheezy de
+live-build. Se puede especificar cualquier nombre de distribución disponible
+en los repositorios Debian indicando su nombre en clave. (Para más detalles
+ver {Términos}#terms). La opción #{--distribution}# no solamente influencia
+la fuente de los paquetes dentro del archivo Debian, sino que instruye a
+/{live-build}/ a comportarse tal y como se necesita para construir cada una
+de las distribuciones. Por ejemplo, para construir contra la versión
+*{inestable}*, Sid, se debe indicar: 
 
 code{
 
@@ -75,8 +76,8 @@ de obtener la mejor velocidad de descarga. Cada una de las opciones
 diferentes etapas de creación. Si se recuerda de {Etapas de la
 creación}#stages-of-the-build, en la etapa de preinstalación (bootstrap) es
 cuando se crea el directorio chroot y se rellena con un sistema mínimo
-mediante  la herramienta debootstrap, y en la etapa *{chroot}* es cuando el
-directorio chroot es completado con los paquetes necesarios para crear el
+mediante  la herramienta /{debootstrap}/, y en la etapa *{chroot}* es cuando
+el directorio chroot es completado con los paquetes necesarios para crear el
 sistema de ficheros que será utilizado en el sistema en vivo. A cada una de
 estas etapas le corresponde su propia opción #{--mirror-*}#. Posteriormente,
 en la etapa *{binary}* se utilizarán las réplicas Debian indicadas en los
@@ -319,10 +320,11 @@ 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}#.
+Una vez ha sido arrancado el sistema en vivo puede conocerse qué tareas
+primarias están disponibles en el Instalador de Debian mediante la orden
+#{tasksel --list-tasks}#. La lista de paquetes contenidos en cualquier tarea
+(incluidas aquellas que no aparecen en la lista de tareas primarias) puede
+obtenerse mediante la orden #{tasksel --task-packages}#.
 
 3~desktop-and-language-tasks Tareas de Escritorio e Idioma
 
@@ -506,11 +508,13 @@ 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.
+Esto no modificará el comportamiento de las entradas definidas en
+#{/etc/apt/sources.list}#, sino que solo afecta a si exitirán o no ficheros
+de índice en el directorio #{/var/lib/apt}#. El compromiso viene de que APT
+necesita estos ficheros índices para funcionar en el sistema en vivo, así
+que, si no existen, el usuario deberá ejecutar la orden #{apt-get update}#
+para crear estos índices antes de poder ejecutar una orden del tipo
+#{apt-cache search}# o #{apt-get install}#.
 
 Si la instalación de los paquetes recomendados aumenta demasiado el tamaño
 de la imagen, se puede desactivar el valor por defecto de esta opción de APT
diff --git a/manual/es/user_customization-runtime.ssi b/manual/es/user_customization-runtime.ssi
index 6ad046c..515b1e2 100644
--- a/manual/es/user_customization-runtime.ssi
+++ b/manual/es/user_customization-runtime.ssi
@@ -248,14 +248,14 @@ code{
 
 }code
 
-Then we reboot. During the first boot the contents of #{/home}# and
-#{/var/cache/apt}# will be copied into the persistent volume, and from then
-on all changes to these directories will live in the persistent
-volume. Please note that any paths listed in the #{live.persist}# file
-cannot contain white spaces or the special #{.}# and #{..}# path
-components. Also, neither #{/live}# (or any of its sub-directories) nor
-#{/}# can be made persistent using custom mounts (for the latter, use the
-#{full-ov}# type persistence described above).
+Entonces reiniciamos. Durante el primer arranque los contenidos de #{/home}#
+y #{/var/cache/apt}# se copiarán en el volumen persistente y a partir de ese
+momento todos los cambios en esos directorios se guardarán allí. Tener en
+cuenta que los rutas listadas en el fichero #{live.persist}# no pueden
+contener espacios en blanco ni los componentes especiales #{.}# y
+#{..}#. Además ni #{/live}# (o ninguno de sus sub-directorios) ni #{/}#
+pueden hacerse persistentes montándolos de forma personalizada. Para este
+último, usar el tipo de persistencia #{full-ov}# descrito anteriormente.
 
 Se puede usar diferentes volúmenes de capas personalizados al mismo tiempo
 (con sus propios ficheros #{live.persist}#) pero si varios volúmenes hacen
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index 9677863..e7c6d63 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -191,8 +191,9 @@ code{
 
 3~ Segunda revisión
 
-In this revision, we're going to clean up from the first build, add the
-/{vlc}/ package to our configuration, rebuild, test and commit.
+En esta revisión, vamos a limpiar desde la primera creación, agregar el
+paquete /{vlc}/ a nuestra configuración, crear de nuevo, probar y enviar los
+cambios al git.
 
 El comando #{lb clean}# limpiará todos los ficheros generados en las
 primeras creaciones a excepción del caché, lo cual ahorra tener que volver a
@@ -206,7 +207,7 @@ code{
 
 }code
 
-Now append the /{vlc}/ package to our local package list in
+Añadir ahora el paquete /{vlc}/ a nuestra lista de paquetes local en
 #{config/package-lists/my.list.chroot}#:
 
 code{
@@ -249,9 +250,9 @@ experiencias recogidas de los usuarios de Debian Live.
 
 *{Caso Práctico:}* Crear una imagen con live-build para arrancar directamente un servidor VNC.
 
-Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
-/{xvnc4viewer}/, disabling recommends to make a minimal system:
+Hacer un directorio de creación y crear una configuración en esqueleto según
+la lista estándar-x11, incluyendo /{gdm3}/, /{metacity}/ y /{xvnc4viewer}/,
+desactivando los paquetes recomendados para conseguir un sistema mínimo:
 
 code{
 
@@ -263,9 +264,10 @@ code{
 
 }code
 
-Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch /{metacity}/ and start /{xvncviewer}/,
-connecting to port #{5901}# on a server at #{192.168.1.2}#:
+Crear el directorio #{/etc/skel}# y poner un fichero #{.xsession}#
+personalizado para el usuario que por defecto ejecutará /{metacity}/ e
+iniciará el /{xvncviewer}/, conectándo al puerto #{5901}# de un servidor en
+#{192.168.1.2}#:
 
 code{
 
@@ -295,15 +297,16 @@ Disfrutarlo.
 
 *{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.
 
-When optimizing an image to fit a certain media size, you need to understand
-the tradeoffs you are making between size and functionality. In this
-example, we trim only so much as to make room for additional material within
-a 128M media size, but without doing anything to destroy integrity of the
-packages contained within, such as the purging of locale data via the
-/{localepurge}/ package, or other such "intrusive" optimizations. Of
-particular note, you should not use #{--bootstrap-flavour minimal}# unless
-you really know what you're doing, as omitting priority #{important}#
-packages will most likely produce a broken live system.
+Al optimizar una imagen para adaptarla al tamaño de algunos medios de
+almacenamiento, es necesario comprender el equilibrio que se está haciendo
+entre tamaño y funcionalidad. En este ejemplo, se recorta tanto sólo para
+dar cabida a material adicional dentro de un tamaño de 128M, pero sin hacer
+nada para destruir la integridad de los paquetes que contiene, tales como la
+depuración de las variantes locales a través del paquete /{localepurge}/ u
+otro tipo de optimizaciones «intrusivas». Cabe destacar que no se debe usar
+#{--bootstrap-flavour minimal}# a menos de que realmente se sepa lo que se
+está haciendo, ya que al omitir paquetes de prioridad *{importante}* lo más
+probable es que se produzca un sistema roto.
 
 code{
 
@@ -325,19 +328,20 @@ anterior produjo una imagen de 78Mbytes. Esto se compara favorablemente en
 tamaño con la imagen de 166Mbytes producida por la configuración por defecto
 en el {Tutorial 1}#tutorial-1.
 
-The biggest space-saver here, compared to building a standard image on an
-#{i386}# architecture system, is to select only the #{486}# kernel flavour
-instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
-#{--apt-indices false}# also saves a fair amount of space, the tradeoff
-being that you need to #{apt-get update}# before using apt in the live
-system. Choosing the #{minimal}# package list leaves out the large
-#{locales}# package and associated utilities. Dropping recommended packages
-with #{--apt-recommends false}# saves some additional space, at the expense
-of omitting some packages you might otherwise expect to be there, such as
-/{firmware-linux-free}/ which may be needed to support certain hardware. The
-remaining options shave off additional small amounts of space. It's up to
-you to decide if the functionality that is sacrificed with each optimization
-is worth the loss in functionality.
+El mayor ahorro de espacio aquí, en comparación con la creación de una
+imagen estándar en un sistema de arquitectura #{i386}# es seleccionar sólo
+la versión del kernel #{486}# en lugar de la de por defecto #{-k "486
+686-pae"}#. Dejar fuera los índices de APT con #{--apt-indices false}#
+también ahorra una cantidad importante de espacio, la desventaja es que es
+necesario hacer un #{apt-get update}# antes de usar apt en el sistema en
+vivo. Elegir la lista del paquete #{minimal}# deja fuera el gran paquete de
+#{locales}# y sus utilidades asociadas. Dejando los paquetes recomendados
+con #{--apt-recommends false}# se ahorra un poco de espacio adicional a
+costa de omitir algunos paquetes que de otro modo podría esperarse que
+estuvieran alli, tal como /{firmware-linux-free}/ que puede ser necesario
+para el soporte de cierto hardware. Las opciones restantes recortan pequeñas
+cantidades adicionales de espacio. Es necesario decidir si vale la pena la
+funcionalidad que se sacrifica con cada optimización.
 
 2~ Un escritorio KDE con variante local e instalador
 
@@ -402,7 +406,8 @@ code{
 
 }code
 
-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
-kernel, as it is currently necessary to make the installer and live system
-kernels match for the launcher to work properly.
+Tener en cuenta que se ha incluido el paquete debian-installer-launcher para
+lanzar el instalador desde el escritorio en vivo, y que también se ha
+especificado el kernel 486, ya que actualmente es necesario que el
+instalador y el kernel del sistema en vivo coincidan para que el lanzador
+funcione correctamente.
diff --git a/manual/es/user_installation.ssi b/manual/es/user_installation.ssi
index b3158be..8e2bb20 100644
--- a/manual/es/user_installation.ssi
+++ b/manual/es/user_installation.ssi
@@ -141,12 +141,13 @@ Se debe crear ya sea en la distribución de destino o en un entorno chroot
 que contenga la plataforma de destino: es decir, si el objetivo es Wheezy
 entonces se debe crear usando Wheezy.
 
-Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
-build live-boot for a target distribution that differs from your build
-system. For example, for Wheezy live images, build live-boot in a Wheezy
-chroot. If your target distribution happens to match your build system
-distribution, you may build directly on the build system using
-#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
+Utilizar un programa creador personal como /{pbuilder}/ o /{sbuild}/ si se
+necesita crear live-boot para una distribución de destino diferente del
+sistema de creación. Por ejemplo, para las imágenes en vivo de Wheezy, crear
+live-boot en un entorno chroot. Si la distribución de destino coincide con
+la distribución actual, se puede crear directamente sobre el sistema de
+creación con #{dpkg-buildpackage}# (proporcionada por el paquete
+/{dpkg-dev}/ ):
 
 code{
 
diff --git a/manual/es/user_overview.ssi b/manual/es/user_overview.ssi
index 2325511..f9620fd 100644
--- a/manual/es/user_overview.ssi
+++ b/manual/es/user_overview.ssi
@@ -15,23 +15,24 @@ La idea detrás de live-build es ser un marco (framework) que utiliza un
 directorio de configuración para automatizar completamente y personalizar
 todos los aspectos de la creación de una imagen de un sistema en vivo.
 
-Many concepts are similar to those in the /{debhelper}/ Debian package tools
-written by Joey Hess:
+Muchos conceptos son similares a los del paquete de herramientas de Debian
+/{debhelper}/ escrito por 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.
+_* Los scripts tienen una ubicación central para la configuración de su
+funcionamiento. En /{debhelper}/, éste es el subdirectorio #{debian/}# de un
+árbol de paquetes. Por ejemplo, dh_install buscará, entre otros, un fichero
+llamado #{debian/install}# para determinar qué ficheros deben existir en un
+paquete binario en particular. De la misma manera, live-build almacena toda
+su configuración bajo un subdirectorio #{config/}#.
 
 _* Los scripts son independientes - es decir, siempre es seguro ejecutar
 cada comando.
 
-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 diferencia de /{debhelper}/, live-build contiene una herramienta para
+crear un directorio de configuración en esqueleto, #{lb config}#. Ésto
+podría ser considerado como similar a herramientas tales como
+#{dh-make}#. Para obtener más información sobre #{lb config}#, consultar {El
+comando lb config }#lb-config
 
 El resto de esta sección describe los tres comandos más importantes:
 
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index 3a144e5..7707eb5 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -77,9 +77,9 @@ système live.
 _* *{live-boot}*: Une collection de scripts utilisés pour lancer des
 systèmes live. live-boot faisait initialement partie de live-initramfs.
 
-_* *{live-build}*: A collection of scripts used to build customized Debian
-Live systems. live-build was formerly known as /{live-helper}/, and even
-earlier known as /{live-package}/.
+_* *{live-build}*: Une collection de scripts utilisés pour personnaliser les
+systèmes Debian Live. live-build était initialement nommé /{live-package}/,
+puis /{live-helper}/.
 
 _* *{live-config}*: Une collection de scripts utilisés pour configurer un
 système live durant le processus d'amorçage. live-config faisait
@@ -94,9 +94,9 @@ distribution Debian.
 _* *{Paramètres d'amorçage}*: Les paramètres pouvant être entrés à l'invite
 de démarrage afin de modifier le noyau ou live-config.
 
-_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run
-different instances of the GNU/Linux environment on a single system
-simultaneously without rebooting.
+_* *{chroot}*: Le programme /{chroot}/, #{chroot(8)}#, nous permet de faire
+tourner plusieurs instances concurrentes de l'environnement GNU/Linux sur un
+système sans redémarrage.
 
 _* *{Image binaire}*: Un fichier contenant le système live, tel que
 binary.iso ou binary.img.
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index 9e19e61..da999b6 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -78,7 +78,7 @@ _* Version de live-boot sur le système live
 
 _* Version de live-config sur le système live
 
-_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system
+_* Version de /{debootstrap}/ et/ou /{cdebootstrap}/ sur le système hôte
 
 _* L'architecture du système live
 
@@ -132,11 +132,11 @@ Où est-ce que le bogue apparaît?
 
 3~ Au moment de la construction tandis l'amorçage
 
-live-build first bootstraps a basic Debian system with /{debootstrap}/ or
-/{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian
-distribution it is bootstrapping, it may fail. If a bug appears here, check
-if the error is related to a specific Debian package (most likely), or if it
-is related to bootstrapping tool itself.
+live-build amorce d'abord un système Debian de base avec /{debootstrap}/ ou
+/{cdebootstrap}/. Selon l'outil d'amorçage utilisé et de la distribution
+Debian il peut échouer. Si un bogue apparaît ici, vérifiez si l'erreur est
+liée à un paquet Debian spécifique (plus probable), ou si il est liée à
+l'outil d'amorçage lui-même.
 
 Dans les deux cas, ce n'est pas un bogue dans Debian Live, mais plutôt dans
 Debian lui-même que nous ne pouvons résoudre directement. S'il vous plaît
@@ -149,10 +149,11 @@ fonction de la distribution Debian utilisée et l'état quotidienne de
 l'archive, il peut échouer. Si un bogue apparaît ici, vérifiez si l'erreur
 est également reproductible sur un système normal.
 
-If this is the case, this is not a bug in Debian Live, but rather in Debian
-- please report it against the failing package. Running /{debootstrap}/
-separately from the Live system build or running #{lb bootstrap --debug}#
-will give you more information.
+Si c'est le cas, ce n'est pas un bogue dans Debian Live, mais plutôt dans
+Debian - s'il vous plaît faire le rapport sur le paquet
+défaillant. L'exécution de /{debootstrap}/ séparément du système de
+construction ou l'exécution de #{lb bootstrap --debug}# vous donnera plus
+d'informations.
 
 Aussi, si vous utilisez un miroir local et/ou un proxy et vous rencontrez un
 problème, s'il vous plaît toujours le reproduire d'abord en amorçant sur un
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index efd3cc0..0a2944b 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -224,7 +224,7 @@ Voir les pages de manuel pour plus de détails.
 
 3~testing-iso-with-virtualbox  Test d'une image ISO avec virtualbox-ose
 
-Afin de tester l'ISO avec #{virtualbox-ose}#:
+Afin de tester l'ISO avec /{virtualbox-ose}/:
 
 code{
 
@@ -238,8 +238,7 @@ Créer une nouvelle machine virtuelle, modifiez les paramètres de stockage
 pour utiliser #{binary-hybrid.iso}# comme le périphérique CD/DVD et démarrer
 la machine.
 
-*{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.
-
+*{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
@@ -258,8 +257,7 @@ pas correctement des images hybrides, ou si vous voulez utiliser l'espace
 disponible sur le support à certaines fins, tel que la persistance d'une
 partition, vous devez utiliser une image HDD. 
 
-*{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):
-
+*{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
@@ -345,8 +343,7 @@ La séquence de commandes suivante va créer une image NetBoot de base
 contenant le système Debian standard sans X.org. Elle peut être démarrée sur
 le réseau.
 
-*{Note:}* if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:
-
+*{Remarque:}* Si vous avez réalisé tous les exemples précédents, vous aurez besoin de nettoyer votre répertoire de travail avec la commande #{lb clean}#:
 code{
 
  # lb clean --binary
diff --git a/manual/fr/user_customization-installer.ssi b/manual/fr/user_customization-installer.ssi
index 77f9c7d..9af599b 100644
--- a/manual/fr/user_customization-installer.ssi
+++ b/manual/fr/user_customization-installer.ssi
@@ -17,10 +17,10 @@ Les trois principaux types de programme d'installation sont:
 
 *{Installateur Debian «Régulière»}*: C'est une image de Debian Live normale avec un noyau et initrd séparés qui (lorsqu'ils sont sélectionnés à partir du chargeur d'amorçage approprié) se lancen dans une instance d'installateur Debian standard, exactement comme si vous aviez téléchargé une image CD de Debian et la auriez démarrée. Les images contenant un système live et un installateur indépendant sont souvent appelés «images combinées".
 
-On such images, Debian is installed by fetching and installing .deb packages
-using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some
-network-based network, resulting in a standard Debian system being installed
-to the hard disk.
+Sur ces images, Debian est installé par l'extraction et l'installation de
+paquets .deb à l'aide de /{debootstrap}/ ou /{cdebootstrap}/, à partir des
+supports locaux ou à partir du réseau, résultant en un système Debian
+standard en cours d'installation sur le disque dur.
 
 Tout ce processus peut être préconfiguré et personnalisé dans un certain
 nombre de façons, voir les pages correspondantes dans le manuel de
@@ -30,18 +30,17 @@ le mettre à l'image et l'activer pour vous.
 
 *{Installateur Debian "Live" }*: C'est une image de Debian Live avec un noyau et initrd séparés qui (lorsqu'ils sont sélectionnés à partir du chargeur d'amorçage approprié) se lancen dans une instance de l'installateur Debian.
 
-Installation will proceed in an identical fashion to the "Regular"
-installation described above, but at the actual package installation stage,
-instead of using /{debootstrap}/ to fetch and install packages, the live
-filesystem image is copied to the target. This is achieved with a special
-udeb called live-installer.
+L'installation se poursuit de manière identique à l'installation "régulière"
+décrite ci-dessus, mais à l'étape de l'installation des paquets, au lieu
+d'utiliser /{debootstrap}/ pour aller chercher et installer des paquets,
+l'image du système de fichiers live est copiée vers la cible. Ce résultat
+est obtenu avec un udeb spécial appelé «live-installer».
 
 Après cette étape, l'installateur Debian se poursuit normalement, en
 installant et configurant des éléments tels que chargeurs de démarrage et
 les utilisateurs locaux, etc
 
-*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.
-
+*{Remarque:}* Pour soutenir les deux options: installateur normal et live dans le chargeur d'amorçage du même support live, vous devez désactiver «live-installer» en utilisant la préconfiguration #{live-installer/enable=false}#.
 *{Installateur Debian "de bureau"}*: Indépendamment du type d'installateur Debian inclus, #{d-i}# peut être lancé à partir du Bureau en cliquant sur une icône. C'est facile à utiliser dans certaines situations. Afin de faire usage de cela, le paquet debian-installer-launcher doit être inclus.
 
 Notez que par défaut, live-build n'inclut pas les images de l'installateur
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 91af193..aec78f4 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -26,15 +26,15 @@ sont installés via APT pinning, pour n'en nommer quelques possibilités.
 
 3~ Distribution, archive areas et 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:
+La distribution que vous choisissez a le plus large impact sur les paquets
+qui sont disponibles à inclure dans votre image live. Indiquez le nom de
+code, qui est par défaut #{wheezy}# pour la version de live-build dans
+Wheezy. Toute distribution actuelle dans l'archive Debian peut être spécifié
+par son nom de code ici. (Voir {Termes}#terms pour plus de détails.)
+L'option #{--distribution}# non seulement influence la source des paquets
+dans l'archive, mais aussi dit live-build comme it doit construire chaque
+distribution soutenue. Par exemple, pour construire contre *{unstable}*,
+Sid, précisez: 
 
 code{
 
@@ -72,11 +72,11 @@ avec la meilleur vitesse de téléchargement. Chacune des options
 #{--mirror-*}# qui régissent quel miroir de distribution est utilisée à
 différentes étapes de la construction. Rappelez-vous de {Étapes de la
 construction}#stages-of-the-build que l'étape *{bootstrap}* c'est quand le
-chroot est initialement peuplée par debootstrap avec un système minimal, et
-l'étape *{chroot}* c'est quand le chroot utilisé pour construire le système
-de fichiers du système live est construit. Ainsi, les commutateurs des
-miroirs correspondants sont utilisées pour ces étapes, et plus tard, dans
-l'étape *{binary}* les valeurs #{--mirror-binary}# et
+chroot est initialement peuplée par /{debootstrap}/ avec un système minimal,
+et l'étape *{chroot}* c'est quand le chroot utilisé pour construire le
+système de fichiers du système live est construit. Ainsi, les commutateurs
+des miroirs correspondants sont utilisées pour ces étapes, et plus tard,
+dans l'étape *{binary}* les valeurs #{--mirror-binary}# et
 #{--mirror-binary-security}# sont utilisées, remplaçant tout miroir utilisé
 dans une étape antérieure. 
 
@@ -314,10 +314,10 @@ 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}#.
+Les tâches principales disponibles dans l'installateur Debian peuvent être
+listés avec #{tasksel --list-tasks}# dans le système live. Le contenu de
+n'importe quelle tâche, y compris ceux non inclus dans cette liste, peuvent
+être examinées avec #{tasksel --task-packages}#.
 
 3~desktop-and-language-tasks Tâches de bureau et de la langue
 
@@ -499,11 +499,12 @@ 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.
+Cela ne influencera les entrées dans #{/etc/apt/sources.list}#, mais
+simplement de savoir si #{/var/lib/apt}# contient les fichiers indices ou
+non. La contrepartie est que APT a besoin de ces indices afin d'opérer dans
+le système live, alors avant de procéder à #{apt-cache search}# or #{apt-get
+install}#, par exemple, l'utilisateur doit faire #{apt-get update}# pour
+créer ces indices.
 
 Si vous trouvez que l'installation des paquets recommandés gonfle votre
 image trop, vous pouvez désactiver l'option par défaut d'APT avec:
diff --git a/manual/fr/user_customization-runtime.ssi b/manual/fr/user_customization-runtime.ssi
index 48a3ddd..734d189 100644
--- a/manual/fr/user_customization-runtime.ssi
+++ b/manual/fr/user_customization-runtime.ssi
@@ -247,14 +247,15 @@ code{
 
 }code
 
-Then we reboot. During the first boot the contents of #{/home}# and
-#{/var/cache/apt}# will be copied into the persistent volume, and from then
-on all changes to these directories will live in the persistent
-volume. Please note that any paths listed in the #{live.persist}# file
-cannot contain white spaces or the special #{.}# and #{..}# path
-components. Also, neither #{/live}# (or any of its sub-directories) nor
-#{/}# can be made persistent using custom mounts (for the latter, use the
-#{full-ov}# type persistence described above).
+Alors nous redémarrons. Lors du premier démarrage les contenus du #{/home}#
+et #{/var/cache/apt}# seront copiés dans le volume persistant, et à partir
+de ce moment tous les changements dans ces répertoires seront stockés dans
+le volume persistant. S'il vous plaît souligner que les chemins d'accès aux
+répertoriés dans le fichier #{live.persist}# ne peuvent pas contenir
+d'espaces blancs ou les éléments spéciaux #{.}# et #{..}#. En outre, ni
+#{/live}# (ou un de ses sous-répertoires), ni #{/}#  peuvent être rendus
+persistants en utilisant custom mounts (pour ce dernier, utilisez la
+persistance #{full-ov}# décrite ci-dessus).
 
 Plusieurs différents volumes de couches personnalisés (avec leurs propres
 fichiers #{live.persist}#) peuvent être utilisés au même temps, mais si
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 8694a58..2334ecf 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -192,8 +192,9 @@ code{
 
 3~ Deuxième révision
 
-In this revision, we're going to clean up from the first build, add the
-/{vlc}/ package to our configuration, rebuild, test and commit.
+Dans cette révision, nous allons nettoyer à partir de la première
+construction, ajouter le paquet /{vlc}/ à notre configuration, reconstruire,
+tester et faire le commit.
 
 La commande #{lb clean}# va nettoyer tous les fichiers générés par la
 construction précédente à l'exception du cache, ça évite d'avoir à
@@ -207,7 +208,7 @@ code{
 
 }code
 
-Now append the /{vlc}/ package to our local package list in
+Maintenant ajouter le paquet /{vlc}/ à votre liste de paquets local dans
 #{config/package-lists/my.list.chroot}#:
 
 code{
@@ -251,9 +252,9 @@ expériences recueillies des utilisateurs de Debian Live.
 
 *{Cas d'utilisation:}* Créer une image avec live-build pour démarrer directement à un serveur VNC.
 
-Make a build directory and create a skeletal configuration in it built
-around the standard-x11 list, including /{gdm3}/, /{metacity}/ and
-/{xvnc4viewer}/, disabling recommends to make a minimal system:
+Faire un répertoire de construction et créer une configuration du squelette
+construit autour de la liste standard x11, avec /{gdm3}/, /{metacity}/ et
+/{xvnc4viewer}/, désactivant «recommends» pour faire un système minimal:
 
 code{
 
@@ -265,9 +266,10 @@ code{
 
 }code
 
-Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
-the default user that will launch /{metacity}/ and start /{xvncviewer}/,
-connecting to port #{5901}# on a server at #{192.168.1.2}#:
+Créez le répertoire #{/etc/skel}# avec une #{.xsession}# personnalisée pour
+l'utilisateur par défaut qui va lancer /{metacity}/ et commencer
+/{xvncviewer}/, en reliant le port #{5901}# sur un serveur à
+#{192.168.1.2}#:
 
 code{
 
@@ -297,15 +299,16 @@ Amusez-vous bien!
 
 *{Cas d'utilisation:}* Créer une image standard avec certains composants éliminés afin de s'adapter sur une clé USB avec 128M avec espace laissé pour l'utiliser à votre convenance.
 
-When optimizing an image to fit a certain media size, you need to understand
-the tradeoffs you are making between size and functionality. In this
-example, we trim only so much as to make room for additional material within
-a 128M media size, but without doing anything to destroy integrity of the
-packages contained within, such as the purging of locale data via the
-/{localepurge}/ package, or other such "intrusive" optimizations. Of
-particular note, you should not use #{--bootstrap-flavour minimal}# unless
-you really know what you're doing, as omitting priority #{important}#
-packages will most likely produce a broken live system.
+Lorsque l'optimisation d'une image adaptée à une dimension des certains
+supports, vous avez besoin de comprendre le compromis que vous faites entre
+la taille et la fonctionnalité. Dans cet exemple, nous réduisons uniquement
+que pour faire place à du matériel supplémentaire au sein d'une taille de
+128M, mais sans rien faire pour détruire l'intégrité des paquets contenus,
+telles que la purge des données de localisation via le paquet
+/{localepurge}/, ou d'autres tels optimisations "intrusives". On notera en
+particulier, vous ne devriez pas utiliser #{--bootstrap-flavour minimal}#
+sauf si vous savez vraiment ce que vous faites, que l'omission de paquets de
+priorité #{importants}# produira probablement un système live cassé.
 
 code{
 
@@ -327,19 +330,21 @@ ci-dessus produit une image de 78Mbyte. Cela se compare favorablement avec
 l'image de 166Mbyte produite par la configuration par défaut dans {Tutoriel
 1}#tutorial-1.
 
-The biggest space-saver here, compared to building a standard image on an
-#{i386}# architecture system, is to select only the #{486}# kernel flavour
-instead of the default #{-k "486 686-pae"}#. Leaving off APT's indices with
-#{--apt-indices false}# also saves a fair amount of space, the tradeoff
-being that you need to #{apt-get update}# before using apt in the live
-system. Choosing the #{minimal}# package list leaves out the large
-#{locales}# package and associated utilities. Dropping recommended packages
-with #{--apt-recommends false}# saves some additional space, at the expense
-of omitting some packages you might otherwise expect to be there, such as
-/{firmware-linux-free}/ which may be needed to support certain hardware. The
-remaining options shave off additional small amounts of space. It's up to
-you to decide if the functionality that is sacrificed with each optimization
-is worth the loss in functionality.
+Le plus grand espace-économiseur ici, par rapport à la construction d'une
+image standard sur une architecture #{i386}#, est de sélectionner uniquement
+le saveur du noyau #{486}# au lieu de la valeur par défaut #{-k "486
+686-pae"}#. Laissant hors indices APT avec #{--apt-indices false}# permet
+aussi d'économiser une bonne quantité d'espace, le compromis étant que vous
+devez faire  #{apt-get update}# avant d'utiliser apt dans le système
+live. Le choix de la liste #{minimal}# laisse de côté les grands paquets de
+#{locales}# et les services associés. Laissant hors les paquets recommandés
+avec #{--apt-recommends false}# économise de l'espace supplémentaire, au
+détriment d'omettre certains paquets vous pourriez autrement attendre à être
+là, tel que /{firmware-linux-free}/ qui peuvent être nécessaires pour
+soutenir certains supports matériels. Les options restantes économisent
+petites quantités d'espace supplémentaires. C'est à vous de décider si la
+fonctionnalité qui est sacrifié avec chaque optimisation est en vaut la
+perte de fonctionnalité.
 
 2~ Un bureau KDE localisé et installateur 
 
@@ -406,7 +411,8 @@ code{
 
 }code
 
-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
-kernel, as it is currently necessary to make the installer and live system
-kernels match for the launcher to work properly.
+Notez que nous avons inclus le paquet debian-installer-launcher pour lancer
+l'installateur à partir du bureau live, nous avons également précisé le
+noyau 486, parce qu'il est actuellement nécessaire faire que l'installateur
+et le noyau du systéme live coïncident pour que le lanceur fonctionne
+correctement.
diff --git a/manual/fr/user_installation.ssi b/manual/fr/user_installation.ssi
index a744b28..5098e82 100644
--- a/manual/fr/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -141,12 +141,13 @@ Vous devez créer sur votre distribution objectif ou en chroot contenant
 votre plateforme objectif: cela signifie que si votre objectif est Wheezy
 alors vous devez créer sur Wheezy.
 
-Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to
-build live-boot for a target distribution that differs from your build
-system. For example, for Wheezy live images, build live-boot in a Wheezy
-chroot. If your target distribution happens to match your build system
-distribution, you may build directly on the build system using
-#{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
+Utilisez un système de construction automatique personnel tels que
+/{pbuilder}/ ou /{sbuild}/ si vous avez besoin pour créer live-boot pour une
+distribution objectif qui diffère de votre système de construction. Par
+exemple, pour les images live de Wheezy, créez live-boot dans un chroot
+Wheezy. Si votre distribution objectif correspond à votre distribution vous
+pouvez créer directement sur le système de construction en utilisant
+#{dpkg-buildpackage}# (fournis par le paquet /{dpkg-dev}/):
 
 code{
 
diff --git a/manual/fr/user_overview.ssi b/manual/fr/user_overview.ssi
index 7790a99..c6c7a75 100644
--- a/manual/fr/user_overview.ssi
+++ b/manual/fr/user_overview.ssi
@@ -14,23 +14,25 @@ L'idée derrière live-build est de constituer un cadre qui utilise un
 répertoire de configuration pour automatiser et personnaliser complètement
 tous les aspects de la construction d'une image Live.
 
-Many concepts are similar to those in the /{debhelper}/ Debian package tools
-written by Joey Hess:
+Plusieurs concepts sont similaires à celles ceux dans le paquet Debian
+/{debhelper}/ écrit par 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.
+_* Les scripts ont un emplacement central pour la configuration de leur
+fonctionnement. Avec /{debhelper}/, c'est le sous-répertoire #{debian/}#
+d'un arbre de paquets. Par exemple, dh_install cherchera, entre autres, un
+fichier appelé #{debian/install}# pour déterminer quels fichiers doivent
+exister dans un paquet binaire particulier. De la même manière, live-build
+enregistre son configuration entièrement sous un sous-répertoire
+#{config/}#.
 
 _* Les scripts sont indépendants - c'est-à-dire, il est toujours sûr
 d'exécuter chaque commande.
 
-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.
+Contrairement à /{debhelper}/, live-build contient un outil pour générer un
+répertoire de configuration en squelette, #{lb config}#. Cela pourrait être
+considéré comme similaire à des outils tels que #{dh-make}#.  Pour plus
+d'informations à propos de #{lb config}#, s'il vous plaît voir {La commande
+lb config}#lb-config.
 
 Le reste de cette section examine les trois commandes les plus importantes:
 
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index f6302ba..8fa56a8 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -217,7 +217,7 @@ Per maggiori dettagli si vedano le pagine di manuale.
 
 3~testing-iso-with-virtualbox Provare un'immagine ISO con virtualbox-ose
 
-Per provare la ISO con #{virtualbox-ose}#:
+Per provare la ISO con /{virtualbox-ose}/:
 
 code{
 
@@ -231,7 +231,7 @@ Creare una nuova macchina virtuale, modificare le impostazione di
 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.
+*{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
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index 99bed21..3abc630 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -31,10 +31,10 @@ in codice, il predefinito per la versione Wheezy di live-build è #{wheezy}#;
 qualsiasi attuale distribuzione mantenuta negli archivi Debian può essere
 qui specificata con il suo nome in codice. (Per ulteriori dettagli
 consultare il {Glossario}#terms). L'opzione #{--distribution}# non solo
-influenza la sorgente dei pacchetti nell'archivio, ma indica a
-#{live-build}# di comportarsi secondo la necessità per compilare ciascuna
-distribuzione supportata. Ad esempio se si vuole costruire un rilascio
-*{unstable}*, Sid, specificare:
+influenza la sorgente dei pacchetti nell'archivio, ma indica a live-build di
+comportarsi secondo la necessità per compilare ciascuna distribuzione
+supportata. Ad esempio se si vuole costruire un rilascio *{unstable}*, Sid,
+specificare:
 
 code{
 
@@ -71,7 +71,7 @@ vicino per la migliore velocità di scaricamento. Ciascuna delle opzioni
 #{--mirror-*}# determina quale mirror della distribuzione è usato nei vari
 stadi della compilazione. Ricordando dalle {Fasi della
 creazione}#stages-of-the-build che la fase di *{avvio}* è quando il chroot è
-inizialmente popolato da debootstrap con un sistema minimale e quella di
+inizialmente popolato da /{debootstrap}/ con un sistema minimale e quella di
 *{chroot}* è quando viene creato il chroot usato per costruire il file
 system del sistema live. Perciò per queste fasi vengono usati i
 corrispondenti cambi di mirror, e in seguito, nella fase *{binaria}* vengono
@@ -481,11 +481,11 @@ code{
 
 }code
 
-Questo non influenzerà le voci in /etc/apt/sources.list, determina solo se
-/var/lib/apt contiene o meno i file degli indici. Il compromesso è che APT
-necessita di quegli indici per operar enel sistema live, perciò prima di
-eseguire #{apt-cache search}# o #{apt-get install}#, per esempio, l'utente
-deve usare prima #{apt-get update}# per crearli.
+Questo non influenzerà le voci in #{/etc/apt/sources.list}#, determina solo
+se /#{var/lib/apt}# contiene o meno i file degli indici. Il compromesso è
+che APT necessita di quegli indici per operar enel sistema live, perciò
+prima di eseguire #{apt-cache search}# o #{apt-get install}#, per esempio,
+l'utente deve usare prima #{apt-get update}# per crearli.
 
 In caso si trovi che l'installazione dei pacchetti raccomandati appesantisca
 troppo l'immagine, si può disabilitare l'opzione predefinita di APT con:
diff --git a/manual/it/user_customization-runtime.ssi b/manual/it/user_customization-runtime.ssi
index 7130898..70046ae 100644
--- a/manual/it/user_customization-runtime.ssi
+++ b/manual/it/user_customization-runtime.ssi
@@ -252,7 +252,7 @@ directory montate sono "nidificate" (una è la sottodirectory dell'altra), la
 superiore sarà montata per prima, per cui nessuna operazione di mount verrà
 sovrastata dall'altra. I mount nidificati personalizzati sono problematici
 se sono elencati nello stesso file #{live.persist}. Se si ha davvero la
-necessità (in genere non si dovrebbe averla :), consultare la manpage di
+necessità (in genere non si dovrebbe averla), consultare la manpage di
 live.persist(5) per sapere come gestire questo caso.
 
 3~ Istantanee
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 0380c7e..7d0f5cb 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -302,7 +302,7 @@ distrugga l'integrità dei pacchetti contenuti, come eliminare localizzazioni
 con il pacchetto /{localepurge}/ o altre ottimizzazioni "intrusive". È da
 notare che non va usato #{--bootstrap-flavour minimal}# a meno che non si
 sappia cosa si sta facendo, come omettere la priorità dei pacchetti
-#{important}# che molto probabilmente produrrà un sistema live danneggiato.
+*{important}* che molto probabilmente produrrà un sistema live danneggiato.
 
 code{
 
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index c18b51c..e4fc31b 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:30+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -525,7 +525,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
 msgstr ""
 
 #. type: Plain text
@@ -550,7 +550,7 @@ msgstr ""
 #. type: Plain text
 #: 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"
+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 ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index f9300e0..f57a37b 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:10+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -263,12 +263,12 @@ msgid ""
 "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."
+"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."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 3c55b17..0c0132b 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:58+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -619,7 +619,7 @@ msgid ""
 "packages contained within, such as the purging of locale data via the /"
 "{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
 "packages will most likely produce a broken live system."
 msgstr ""
 
diff --git a/manual/po/es/about_manual.ssi.po b/manual/po/es/about_manual.ssi.po
index 5f64c25..18fccf0 100644
--- a/manual/po/es/about_manual.ssi.po
+++ b/manual/po/es/about_manual.ssi.po
@@ -220,11 +220,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:34
-#, fuzzy
-#| msgid ""
-#| "_* *{live-build}*: A collection of scripts used to build customized "
-#| "Debian Live systems. live-build was formerly known as live-helper, and "
-#| "even earlier known as live-package."
 msgid ""
 "_* *{live-build}*: A collection of scripts used to build customized Debian "
 "Live systems. live-build was formerly known as /{live-helper}/, and even "
@@ -232,7 +227,7 @@ msgid ""
 msgstr ""
 "_* *{live-build}*: Es una colección de scripts utilizados para construir "
 "sistemas Debian Live personalizados. live-build fue conocido anteriormente "
-"como live-helper, y en una versión anterior como live-package."
+"como /{live-helper}/, y en una versión anterior como /{live-package}/."
 
 #. type: Plain text
 #: en/about_manual.ssi:36
@@ -278,17 +273,12 @@ msgstr ""
 # No se ha traducido chroot entendiendo que es nombre propio, manteniendo la minúscula deliberadamente.
 #. type: Plain text
 #: en/about_manual.ssi:44
-#, fuzzy
-#| msgid ""
-#| "_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
-#| "different instances of the GNU/Linux environment on a single system "
-#| "simultaneously without rebooting."
 msgid ""
 "_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
 "different instances of the GNU/Linux environment on a single system "
 "simultaneously without rebooting."
 msgstr ""
-"_* *{chroot}*: El programa chroot, #{chroot(8)}#, permite ejecutar "
+"_* *{chroot}*: El programa /{chroot}/, #{chroot(8)}#, permite ejecutar "
 "diferentes instancias de un entorno GNU/Linux en un solo sistema de manera "
 "simultánea sin necesidad de reiniciar el sistema."
 
diff --git a/manual/po/es/project_bugs.ssi.po b/manual/po/es/project_bugs.ssi.po
index 9ccb095..083593f 100644
--- a/manual/po/es/project_bugs.ssi.po
+++ b/manual/po/es/project_bugs.ssi.po
@@ -364,13 +364,10 @@ msgstr "_* Versión de live-config en el sistema en vivo."
 
 #. type: Plain text
 #: en/project_bugs.ssi:50
-#, fuzzy
-#| msgid ""
-#| "_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
 msgid ""
 "_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
 msgstr ""
-"_* Versión de #{debootstrap}# y/o #{cdebootstrap}# en el sistema anfitrión."
+"_* Versión de /{debootstrap}/ y/o /{cdebootstrap}/ en el sistema anfitrión."
 
 #. type: Plain text
 #: en/project_bugs.ssi:52
@@ -491,13 +488,6 @@ msgstr "3~ En la preinstalación (bootstrap) en tiempo de creación."
 
 #. type: Plain text
 #: en/project_bugs.ssi:82
-#, fuzzy
-#| msgid ""
-#| "live-build first bootstraps a basic Debian system with #{debootstrap}# or "
-#| "#{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
-#| "distribution it is bootstrapping, it may fail. If a bug appears here, "
-#| "check if the error is related to a specific Debian package (most likely), "
-#| "or if it is related to bootstrapping tool itself."
 msgid ""
 "live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
 "{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
@@ -505,8 +495,8 @@ msgid ""
 "if the error is related to a specific Debian package (most likely), or if it "
 "is related to bootstrapping tool itself."
 msgstr ""
-"live-build arranca primero un sistema Debian básico con #{debootstrap}# o #"
-"{cdebootstrap}#. Puede fallar dependiendo de la herramienta usada en la "
+"live-build arranca primero un sistema Debian básico con /{debootstrap}/ o /"
+"{cdebootstrap}/. Puede fallar dependiendo de la herramienta usada en la "
 "preinstalación y de la distribución Debian empleada. Si un error aparece en "
 "este momento, se debe comprobar si está relacionado con un paquete "
 "específico de Debian (es lo más probable), o si está relacionado con la "
@@ -544,12 +534,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:90
-#, fuzzy
-#| 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}# separately from the Live system build or running #{lb "
-#| "bootstrap --debug}# will give you more information."
 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}/ "
@@ -558,7 +542,7 @@ msgid ""
 msgstr ""
 "Si este es el caso, esto no es un error de Debian Live, sino de Debian - se "
 "debe informar sobre el paquete que falla. Se puede obtener más información "
-"ejecutando #{debootstrap}# de forma separada del sistema de creación en vivo "
+"ejecutando /{debootstrap}/ de forma separada del sistema de creación en vivo "
 "o ejecutando #{lb bootstrap --debug}#."
 
 #. type: Plain text
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index 163b9ff..7646a28 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:30+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"
@@ -666,8 +666,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
-msgstr "Para probar una imagen ISO con #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
+msgstr "Para probar una imagen ISO con /{virtualbox-ose}/:"
 
 #. type: Plain text
 #: en/user_basics.ssi:130
@@ -693,10 +693,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:138
-#, fuzzy, 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."
-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"
+#, 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"
 
 #. type: Plain text
 #: en/user_basics.ssi:142
@@ -733,10 +732,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:150
-#, fuzzy, 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):"
+#, 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):"
 
 #. type: Plain text
 #: en/user_basics.ssi:154 en/user_basics.ssi:220
@@ -896,10 +894,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:216
-#, fuzzy, no-wrap
-#| msgid "Note: if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:"
+#, 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}#:"
 
 #. type: Plain text
 #: en/user_basics.ssi:224
diff --git a/manual/po/es/user_customization-installer.ssi.po b/manual/po/es/user_customization-installer.ssi.po
index 39d976e..680fca4 100644
--- a/manual/po/es/user_customization-installer.ssi.po
+++ b/manual/po/es/user_customization-installer.ssi.po
@@ -217,12 +217,6 @@ msgstr "*{Imágenes con Instalador Debian «official»}*: Esta imagen de Debian
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:16
-#, fuzzy
-#| msgid ""
-#| "On such images, Debian is installed by fetching and installing .deb "
-#| "packages using #{debootstrap}# or #{cdebootstrap}#, from the local media "
-#| "or some network-based network, resulting in a standard Debian system "
-#| "being installed to the hard disk."
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
 "using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
@@ -230,7 +224,7 @@ msgid ""
 "to the hard disk."
 msgstr ""
 "En estas imágenes, el sistema operativo Debian se instala mediante la "
-"herramienta #{debootstrap}# o #{cdebootstrap}# que descarga paquetes .deb, "
+"herramienta /{debootstrap}/ o /{cdebootstrap}/ que descarga paquetes .deb, "
 "desde medios locales o por red local, y los instala de forma tradicional. El "
 "resultado final es un sistema Debian estándar instalado en el disco duro."
 
@@ -256,13 +250,6 @@ msgstr "*{Imágenes con Instalador Debian «Live»}*: Estas imágenes de Debian
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:22
-#, fuzzy
-#| msgid ""
-#| "Installation will proceed in an identical fashion to the \"Regular\" "
-#| "installation described above, but at the actual package installation "
-#| "stage, instead of using #{debootstrap}# to fetch and install packages, "
-#| "the live filesystem image is copied to the target. This is achieved with "
-#| "a special udeb called live-installer."
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
@@ -271,7 +258,7 @@ msgid ""
 "udeb called live-installer."
 msgstr ""
 "El procedimiento de instalación es idéntico al realizado por las imagenes "
-"«Regulares» pero, en lugar de utilizar #{debootstrap}# para obtener e "
+"«Regulares» pero, en lugar de utilizar /{debootstrap}/ para obtener e "
 "instalar paquetes .deb, lo que hace es copiar al disco duro la imagen del "
 "sistema de ficheros que se había preparado para lanzar el sistema en vivo. "
 "Esto se logra mediante un .udeb especial llamado live-installer."
@@ -288,10 +275,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:26
-#, fuzzy, no-wrap
-#| msgid "Note: to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#."
+#, no-wrap
 msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
-msgstr "Nota: Para poder arrancar los dos tipos de imágenes, Regular y Live, en el mismo medio, el gestor de arranque debe poder deshabilitar live-installer. Esto se hace utilizando la variable de preconfiguración (preseed) #{live-installer/enable=false}#."
+msgstr "*{Nota:}* Para poder arrancar los dos tipos de imágenes, Regular y Live, en el mismo medio, el gestor de arranque debe poder deshabilitar live-installer. Esto se hace utilizando la variable de preconfiguración (preseed) #{live-installer/enable=false}#."
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:28
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 7b9b165..f20b3bc 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-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:10+0300\n"
 "PO-Revision-Date: 2012-02-19 17:53+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -228,17 +228,6 @@ msgstr "3~ Distribución, áreas de archivo y modo"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
-#, fuzzy
-#| msgid ""
-#| "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:"
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
@@ -256,8 +245,8 @@ msgstr ""
 "live-build. Se puede especificar cualquier nombre de distribución disponible "
 "en los repositorios Debian indicando su nombre en clave. (Para más detalles "
 "ver {Términos}#terms). La opción #{--distribution}# no solamente influencia "
-"la fuente de los paquetes dentro del archivo Debian, sino que instruye a #"
-"{live-build}# a comportarse tal y como se necesita para construir cada una "
+"la fuente de los paquetes dentro del archivo Debian, sino que instruye a /"
+"{live-build}/ a comportarse tal y como se necesita para construir cada una "
 "de las distribuciones. Por ejemplo, para construir contra la versión *"
 "{inestable}*, Sid, se debe indicar: "
 
@@ -325,12 +314,12 @@ msgid ""
 "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."
+"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."
 msgstr ""
 "Los repositorios de Debian están replicados en una gran red alrededor del "
 "mundo, de manera que se puede seleccionar la réplica más cercana con el fin "
@@ -339,13 +328,13 @@ msgstr ""
 "diferentes etapas de creación. Si se recuerda de {Etapas de la creación}"
 "#stages-of-the-build, en la etapa de preinstalación (bootstrap) es cuando se "
 "crea el directorio chroot y se rellena con un sistema mínimo  mediante  la "
-"herramienta debootstrap, y en la etapa *{chroot}* es cuando el directorio "
-"chroot es completado con los paquetes necesarios para crear el sistema de "
-"ficheros que será utilizado en el sistema en vivo. A cada una de estas "
-"etapas le corresponde su propia opción #{--mirror-*}#. Posteriormente, en la "
-"etapa *{binary}* se utilizarán las réplicas Debian indicadas en los valores "
-"de las opciones #{--mirror-binary}# y #{--mirror-binary-security}# en lugar "
-"de utilizar los indicados para las etapas anteriores."
+"herramienta /{debootstrap}/, y en la etapa *{chroot}* es cuando el "
+"directorio chroot es completado con los paquetes necesarios para crear el "
+"sistema de ficheros que será utilizado en el sistema en vivo. A cada una de "
+"estas etapas le corresponde su propia opción #{--mirror-*}#. Posteriormente, "
+"en la etapa *{binary}* se utilizarán las réplicas Debian indicadas en los "
+"valores de las opciones #{--mirror-binary}# y #{--mirror-binary-security}# "
+"en lugar de utilizar los indicados para las etapas anteriores."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:36
@@ -821,12 +810,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:191
-#, fuzzy
-#| msgid ""
-#| "The primary tasks available in the Debian Installer can be listed with #"
-#| "{tasksel --list-tasks}# in the live system. The contents of any task, "
-#| "including ones not included in this list, may be examined with #{tasksel "
-#| "--task-packages}#."
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -1253,13 +1236,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:294
-#, fuzzy
-#| msgid ""
-#| "This will not influence the entries in /etc/apt/sources.list, but merely "
-#| "whether /var/lib/apt contains the indices files or not. The tradeoff is "
-#| "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."
 msgid ""
 "This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
 "whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
@@ -1267,10 +1243,10 @@ msgid ""
 "before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
 "the user must #{apt-get update}# first to create those indices."
 msgstr ""
-"Esto no modificará el comportamiento de las entradas definidas en /etc/apt/"
-"sources.list, sino que solo afecta a si exitirán o no ficheros de índice en "
-"el directorio /var/lib/apt. El compromiso viene de que APT necesita estos "
-"ficheros índices para funcionar en el sistema en vivo, así que, si no "
+"Esto no modificará el comportamiento de las entradas definidas en #{/etc/apt/"
+"sources.list}#, sino que solo afecta a si exitirán o no ficheros de índice "
+"en el directorio #{/var/lib/apt}#. El compromiso viene de que APT necesita "
+"estos ficheros índices para funcionar en el sistema en vivo, así que, si no "
 "existen, el usuario deberá ejecutar la orden #{apt-get update}# para crear "
 "estos índices antes de poder ejecutar una orden del tipo #{apt-cache search}"
 "# o #{apt-get install}#."
diff --git a/manual/po/es/user_customization-runtime.ssi.po b/manual/po/es/user_customization-runtime.ssi.po
index c8fc20f..68f713c 100644
--- a/manual/po/es/user_customization-runtime.ssi.po
+++ b/manual/po/es/user_customization-runtime.ssi.po
@@ -670,16 +670,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:164
-#, fuzzy
-#| msgid ""
-#| "Then we reboot. During the first boot the contents of /home and /var/"
-#| "cache/apt will be copied into the persistent volume, and from then on all "
-#| "changes to these directories will live in the persistent volume. Please "
-#| "note that any paths listed in the #{live.persist}# file cannot contain "
-#| "white spaces or the special \".\" and \"..\" path components. Also, "
-#| "neither \"/live\" (or any of its sub-directories) nor \"/\" can be made "
-#| "persistent using custom mounts (for the latter, use the #{full-ov}# type "
-#| "persistence described above)."
 msgid ""
 "Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
 "cache/apt}# will be copied into the persistent volume, and from then on all "
@@ -690,12 +680,12 @@ msgid ""
 "using custom mounts (for the latter, use the #{full-ov}# type persistence "
 "described above)."
 msgstr ""
-"Entonces reiniciamos. Durante el primer arranque los contenidos de /home y /"
-"var/cache/apt se copiarán en el volumen persistente y a partir de ese "
+"Entonces reiniciamos. Durante el primer arranque los contenidos de #{/home}# "
+"y #{/var/cache/apt}# se copiarán en el volumen persistente y a partir de ese "
 "momento todos los cambios en esos directorios se guardarán allí. Tener en "
 "cuenta que los rutas listadas en el fichero #{live.persist}# no pueden "
-"contener espacios en blanco o los componentes especiales \".\" y  \"..\". "
-"Además ni \"/live\" (o ninguno de sus sub-directorios) ni \"/\" pueden "
+"contener espacios en blanco ni los componentes especiales #{.}# y #{..}#. "
+"Además ni #{/live}# (o ninguno de sus sub-directorios) ni #{/}# pueden "
 "hacerse persistentes montándolos de forma personalizada. Para este último, "
 "usar el tipo de persistencia #{full-ov}# descrito anteriormente."
 
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index af5d425..454fb2f 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:58+0300\n"
 "PO-Revision-Date: 2012-02-19 18:29+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -527,16 +527,12 @@ msgstr "3~ Segunda revisión"
 
 #. type: Plain text
 #: en/user_examples.ssi:137
-#, fuzzy
-#| 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."
 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 ""
 "En esta revisión, vamos a limpiar desde la primera creación, agregar el "
-"paquete #{vlc}# a nuestra configuración, crear de nuevo, probar y enviar los "
+"paquete /{vlc}/ a nuestra configuración, crear de nuevo, probar y enviar los "
 "cambios al git."
 
 #. type: Plain text
@@ -561,15 +557,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:147
-#, fuzzy
-#| msgid ""
-#| "Now append the #{vlc}# package to our local package list in #{config/"
-#| "package-lists/my.list.chroot}#:"
 msgid ""
 "Now append the /{vlc}/ package to our local package list in #{config/package-"
 "lists/my.list.chroot}#:"
 msgstr ""
-"Añadir ahora el paquete #{vlc}# a nuestra lista de paquetes local en #"
+"Añadir ahora el paquete /{vlc}/ a nuestra lista de paquetes local en #"
 "{config/package-lists/my.list.chroot}#:"
 
 #. type: Plain text
@@ -647,18 +639,13 @@ msgstr "*{Caso Práctico:}* Crear una imagen con live-build para arrancar direct
 
 #. type: Plain text
 #: en/user_examples.ssi:179
-#, fuzzy
-#| msgid ""
-#| "Make a build directory and create a skeletal configuration in it built "
-#| "around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-#| "{xvnc4viewer}#, disabling recommends to make a minimal system:"
 msgid ""
 "Make a build directory and create a skeletal configuration in it built "
 "around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
 "{xvnc4viewer}/, disabling recommends to make a minimal system:"
 msgstr ""
 "Hacer un directorio de creación y crear una configuración en esqueleto según "
-"la lista estándar-x11, incluyendo #{gdm3}#, #{metacity}# y #{xvnc4viewer}#, "
+"la lista estándar-x11, incluyendo /{gdm3}/, /{metacity}/ y /{xvnc4viewer}/, "
 "desactivando los paquetes recomendados para conseguir un sistema mínimo:"
 
 #. type: Plain text
@@ -674,20 +661,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:191
-#, fuzzy
-#| msgid ""
-#| "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it "
-#| "for the default user that will launch metacity and start xvncviewer, "
-#| "connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgid ""
 "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
 "the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
 "connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 "Crear el directorio #{/etc/skel}# y poner un fichero #{.xsession}# "
-"personalizado para el usuario que por defecto ejecutará metacity e iniciará "
-"el xvncviewer, conectándo al puerto #{5901}# de un servidor en #{192.168.1.2}"
-"#:"
+"personalizado para el usuario que por defecto ejecutará /{metacity}/ e "
+"iniciará el /{xvncviewer}/, conectándo al puerto #{5901}# de un servidor en #"
+"{192.168.1.2}#:"
 
 #. type: Plain text
 #: en/user_examples.ssi:197
@@ -737,18 +719,6 @@ msgstr "*{Caso Práctico:}* Crear una imagen estándar quitando algunos componen
 
 #. type: Plain text
 #: en/user_examples.ssi:221
-#, fuzzy
-#| msgid ""
-#| "When optimizing an image to fit a certain media size, you need to "
-#| "understand the tradeoffs you are making between size and functionality. "
-#| "In this example, we trim only so much as to make room for additional "
-#| "material within a 128M media size, but without doing anything to destroy "
-#| "integrity of the packages contained within, such as the purging of locale "
-#| "data via the #{localepurge}# package, or other such \"intrusive\" "
-#| "optimizations. Of particular note, you should not use #{--bootstrap-"
-#| "flavour minimal}# unless you really know what you're doing, as omitting "
-#| "priority #{important}# packages will most likely produce a broken live "
-#| "system."
 msgid ""
 "When optimizing an image to fit a certain media size, you need to understand "
 "the tradeoffs you are making between size and functionality. In this "
@@ -757,7 +727,7 @@ msgid ""
 "packages contained within, such as the purging of locale data via the /"
 "{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
 "packages will most likely produce a broken live system."
 msgstr ""
 "Al optimizar una imagen para adaptarla al tamaño de algunos medios de "
@@ -765,10 +735,10 @@ msgstr ""
 "entre tamaño y funcionalidad. En este ejemplo, se recorta tanto sólo para "
 "dar cabida a material adicional dentro de un tamaño de 128M, pero sin hacer "
 "nada para destruir la integridad de los paquetes que contiene, tales como la "
-"depuración de las variantes locales a través del paquete #{localepurge}# u "
+"depuración de las variantes locales a través del paquete /{localepurge}/ u "
 "otro tipo de optimizaciones «intrusivas». Cabe destacar que no se debe usar #"
 "{--bootstrap-flavour minimal}# a menos de que realmente se sepa lo que se "
-"está haciendo, ya que al omitir paquetes de prioridad #{importante}# lo más "
+"está haciendo, ya que al omitir paquetes de prioridad *{importante}* lo más "
 "probable es que se produzca un sistema roto."
 
 #. type: Plain text
@@ -798,21 +768,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:240
-#, fuzzy
-#| msgid ""
-#| "The biggest space-saver here, compared to building a standard image on an "
-#| "#{i386}# architecture system, is to select only the #{486}# kernel "
-#| "flavour instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's "
-#| "indices with #{--apt-indices false}# also saves a fair amount of space, "
-#| "the tradeoff being that you need to #{apt-get update}# before using apt "
-#| "in the live system. Choosing the #{minimal}# package list leaves out the "
-#| "large #{locales}# package and associated utilities. Dropping recommended "
-#| "packages with #{--apt-recommends false}# saves some additional space, at "
-#| "the expense of omitting some packages you might otherwise expect to be "
-#| "there, such as #{firmware-linux-free}# which may be needed to support "
-#| "certain hardware. The remaining options shave off additional small "
-#| "amounts of space. It's up to you to decide if the functionality that is "
-#| "sacrificed with each optimization is worth the loss in functionality."
 msgid ""
 "The biggest space-saver here, compared to building a standard image on an #"
 "{i386}# architecture system, is to select only the #{486}# kernel flavour "
@@ -838,7 +793,7 @@ msgstr ""
 "sus utilidades asociadas. Dejando los paquetes recomendados con #{--apt-"
 "recommends false}# se ahorra un poco de espacio adicional a costa de omitir "
 "algunos paquetes que de otro modo podría esperarse que estuvieran alli, tal "
-"como #{firmware-linux-free}# que puede ser necesario para el soporte de "
+"como /{firmware-linux-free}/ que puede ser necesario para el soporte de "
 "cierto hardware. Las opciones restantes recortan pequeñas cantidades "
 "adicionales de espacio. Es necesario decidir si vale la pena la "
 "funcionalidad que se sacrifica con cada optimización."
@@ -953,20 +908,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:292
-#, fuzzy
-#| 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 kernel, as it is currently necessary to make the installer "
-#| "and live system kernels match for the launcher to work properly."
 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 "
 "kernel, as it is currently necessary to make the installer and live system "
 "kernels match for the launcher to work properly."
 msgstr ""
-"Tener en cuenta que se ha incluido el paquete #{debian-installer-launcher}# "
-"para lanzar el instalador desde el escritorio en vivo, y que también se ha "
+"Tener en cuenta que se ha incluido el paquete debian-installer-launcher para "
+"lanzar el instalador desde el escritorio en vivo, y que también se ha "
 "especificado el kernel 486, ya que actualmente es necesario que el "
 "instalador y el kernel del sistema en vivo coincidan para que el lanzador "
 "funcione correctamente."
diff --git a/manual/po/es/user_installation.ssi.po b/manual/po/es/user_installation.ssi.po
index b3a1668..d0cdb99 100644
--- a/manual/po/es/user_installation.ssi.po
+++ b/manual/po/es/user_installation.ssi.po
@@ -450,14 +450,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:127
-#, fuzzy
-#| msgid ""
-#| "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-#| "build #{live-boot}# for a target distribution that differs from your "
-#| "build system. For example, for Wheezy live images, build #{live-boot}# in "
-#| "a Wheezy chroot. If your target distribution happens to match your build "
-#| "system distribution, you may build directly on the build system using #"
-#| "{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):"
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build live-boot for a target distribution that differs from your build "
@@ -467,10 +459,10 @@ msgid ""
 "buildpackage}# (provided by the /{dpkg-dev}/ package):"
 msgstr ""
 "Utilizar un programa creador personal como /{pbuilder}/ o /{sbuild}/ si se "
-"necesita crear #{live-boot}# para una distribución de destino diferente del "
+"necesita crear live-boot para una distribución de destino diferente del "
 "sistema de creación. Por ejemplo, para las imágenes en vivo de Wheezy, crear "
-"#{live-boot}# en un entorno chroot. Si la distribución de destino coincide "
-"con la distribución actual, se puede crear directamente sobre el sistema de "
+"live-boot en un entorno chroot. Si la distribución de destino coincide con "
+"la distribución actual, se puede crear directamente sobre el sistema de "
 "creación con #{dpkg-buildpackage}# (proporcionada por el paquete /{dpkg-"
 "dev}/ ):"
 
diff --git a/manual/po/es/user_overview.ssi.po b/manual/po/es/user_overview.ssi.po
index 244c617..d0deb19 100644
--- a/manual/po/es/user_overview.ssi.po
+++ b/manual/po/es/user_overview.ssi.po
@@ -210,27 +210,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:14
-#, fuzzy
-#| msgid ""
-#| "Many concepts are similar to those in the debhelper Debian package tools "
-#| "written by Joey Hess:"
 msgid ""
 "Many concepts are similar to those in the /{debhelper}/ Debian package tools "
 "written by Joey Hess:"
 msgstr ""
-"Muchos conceptos son similares a los del paquete de herramientas de Debian "
-"debhelper escrito por Joey Hess:"
+"Muchos conceptos son similares a los del paquete de herramientas de Debian /"
+"{debhelper}/ escrito por Joey Hess:"
 
 #. type: Plain text
 #: en/user_overview.ssi:16
-#, fuzzy
-#| msgid ""
-#| "_* 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."
 msgid ""
 "_* The scripts have a central location for configuring their operation. In /"
 "{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
@@ -240,7 +228,7 @@ msgid ""
 "under a #{config/}# subdirectory."
 msgstr ""
 "_* Los scripts tienen una ubicación central para la configuración de su "
-"funcionamiento. En debhelper, éste es el subdirectorio #{debian/}# de un "
+"funcionamiento. En /{debhelper}/, éste es el subdirectorio #{debian/}# de un "
 "árbol de paquetes. Por ejemplo, dh_install buscará, entre otros, un fichero "
 "llamado #{debian/install}# para determinar qué ficheros deben existir en un "
 "paquete binario en particular. De la misma manera, live-build almacena toda "
@@ -257,23 +245,17 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:20
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "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."
 msgstr ""
-"A diferencia de debhelper, live-build contiene una herramienta para crear un "
-"directorio de configuración en esqueleto, #{lb config}#. Ésto podría ser "
-"considerado como similar a herramientas tales como #{dh-make}#. Para obtener "
-"más información sobre #{lb config}#, consultar {El comando lb config }#lb-"
-"config"
+"A diferencia de /{debhelper}/, live-build contiene una herramienta para "
+"crear un directorio de configuración en esqueleto, #{lb config}#. Ésto "
+"podría ser considerado como similar a herramientas tales como #{dh-make}#. "
+"Para obtener más información sobre #{lb config}#, consultar {El comando lb "
+"config }#lb-config"
 
 #. type: Plain text
 #: en/user_overview.ssi:22
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index d4a514e..b81ab42 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -204,19 +204,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:34
-#, fuzzy
-#| msgid ""
-#| "_* *{live-build}*: A collection of scripts used to build customized "
-#| "Debian Live systems. live-build was formerly known as live-helper, and "
-#| "even earlier known as live-package."
 msgid ""
 "_* *{live-build}*: A collection of scripts used to build customized Debian "
 "Live systems. live-build was formerly known as /{live-helper}/, and even "
 "earlier known as /{live-package}/."
 msgstr ""
 "_* *{live-build}*: Une collection de scripts utilisés pour personnaliser les "
-"systèmes Debian Live. live-build était initialement nommé live-package, puis "
-"live-helper."
+"systèmes Debian Live. live-build était initialement nommé /{live-package}/, "
+"puis /{live-helper}/."
 
 #. type: Plain text
 #: en/about_manual.ssi:36
@@ -257,17 +252,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:44
-#, fuzzy
-#| msgid ""
-#| "_* *{chroot}*: The chroot program, #{chroot(8)}#, enables us to run "
-#| "different instances of the GNU/Linux environment on a single system "
-#| "simultaneously without rebooting."
 msgid ""
 "_* *{chroot}*: The /{chroot}/ program, #{chroot(8)}#, enables us to run "
 "different instances of the GNU/Linux environment on a single system "
 "simultaneously without rebooting."
 msgstr ""
-"_* *{chroot}*: Le programme chroot, #{chroot(8)}#, nous permet de faire "
+"_* *{chroot}*: Le programme /{chroot}/, #{chroot(8)}#, nous permet de faire "
 "tourner plusieurs instances concurrentes de l'environnement GNU/Linux sur un "
 "système sans redémarrage."
 
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index b528068..39f3bb5 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -361,13 +361,10 @@ msgstr "_* Version de live-config sur le système live"
 
 #. type: Plain text
 #: en/project_bugs.ssi:50
-#, fuzzy
-#| msgid ""
-#| "_* Version of #{debootstrap}# and/or #{cdebootstrap}# on the host system"
 msgid ""
 "_* Version of /{debootstrap}/ and/or /{cdebootstrap}/ on the host system"
 msgstr ""
-"_* Version de #{debootstrap}# et/ou #{cdebootstrap}# sur le système hôte"
+"_* Version de /{debootstrap}/ et/ou /{cdebootstrap}/ sur le système hôte"
 
 #. type: Plain text
 #: en/project_bugs.ssi:52
@@ -488,13 +485,6 @@ msgstr "3~ Au moment de la construction tandis l'amorçage"
 
 #. type: Plain text
 #: en/project_bugs.ssi:82
-#, fuzzy
-#| msgid ""
-#| "live-build first bootstraps a basic Debian system with #{debootstrap}# or "
-#| "#{cdebootstrap}#. Depending on the bootstrapping tool used and the Debian "
-#| "distribution it is bootstrapping, it may fail. If a bug appears here, "
-#| "check if the error is related to a specific Debian package (most likely), "
-#| "or if it is related to bootstrapping tool itself."
 msgid ""
 "live-build first bootstraps a basic Debian system with /{debootstrap}/ or /"
 "{cdebootstrap}/. Depending on the bootstrapping tool used and the Debian "
@@ -502,8 +492,8 @@ msgid ""
 "if the error is related to a specific Debian package (most likely), or if it "
 "is related to bootstrapping tool itself."
 msgstr ""
-"live-build amorce d'abord un système Debian de base avec #{debootstrap}# ou #"
-"{cdebootstrap}#. Selon l'outil d'amorçage utilisé et de la distribution "
+"live-build amorce d'abord un système Debian de base avec /{debootstrap}/ ou /"
+"{cdebootstrap}/. Selon l'outil d'amorçage utilisé et de la distribution "
 "Debian il peut échouer. Si un bogue apparaît ici, vérifiez si l'erreur est "
 "liée à un paquet Debian spécifique (plus probable), ou si il est liée à "
 "l'outil d'amorçage lui-même."
@@ -539,12 +529,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/project_bugs.ssi:90
-#, fuzzy
-#| 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}# separately from the Live system build or running #{lb "
-#| "bootstrap --debug}# will give you more information."
 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}/ "
@@ -553,7 +537,7 @@ msgid ""
 msgstr ""
 "Si c'est le cas, ce n'est pas un bogue dans Debian Live, mais plutôt dans "
 "Debian - s'il vous plaît faire le rapport sur le paquet défaillant. "
-"L'exécution de #{debootstrap}# séparément du système de construction ou "
+"L'exécution de /{debootstrap}/ séparément du système de construction ou "
 "l'exécution de #{lb bootstrap --debug}# vous donnera plus d'informations."
 
 #. type: Plain text
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index 1ac3728..9c6aec8 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:30+0300\n"
 "PO-Revision-Date: 2012-03-17 20:08+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -659,8 +659,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
-msgstr "Afin de tester l'ISO avec #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
+msgstr "Afin de tester l'ISO avec /{virtualbox-ose}/:"
 
 #. type: Plain text
 #: en/user_basics.ssi:130
@@ -686,10 +686,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:138
-#, fuzzy, 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."
-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."
+#, 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."
 
 #. type: Plain text
 #: en/user_basics.ssi:142
@@ -726,10 +725,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:150
-#, fuzzy, 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):"
+#, 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):"
 
 #. type: Plain text
 #: en/user_basics.ssi:154 en/user_basics.ssi:220
@@ -891,10 +889,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:216
-#, fuzzy, no-wrap
-#| msgid "Note: if you performed any previous examples, you will need to clean up your working directory with the #{lb clean}# command:"
+#, 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é tous les 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é tous les exemples précédents, vous aurez besoin de nettoyer votre répertoire de travail avec la commande #{lb clean}#:"
 
 #. type: Plain text
 #: en/user_basics.ssi:224
diff --git a/manual/po/fr/user_customization-installer.ssi.po b/manual/po/fr/user_customization-installer.ssi.po
index 677127a..ce492e4 100644
--- a/manual/po/fr/user_customization-installer.ssi.po
+++ b/manual/po/fr/user_customization-installer.ssi.po
@@ -211,12 +211,6 @@ msgstr "*{Installateur Debian «Régulière»}*: C'est une image de Debian Live
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:16
-#, fuzzy
-#| msgid ""
-#| "On such images, Debian is installed by fetching and installing .deb "
-#| "packages using #{debootstrap}# or #{cdebootstrap}#, from the local media "
-#| "or some network-based network, resulting in a standard Debian system "
-#| "being installed to the hard disk."
 msgid ""
 "On such images, Debian is installed by fetching and installing .deb packages "
 "using /{debootstrap}/ or /{cdebootstrap}/, from the local media or some "
@@ -224,7 +218,7 @@ msgid ""
 "to the hard disk."
 msgstr ""
 "Sur ces images, Debian est installé par l'extraction et l'installation de "
-"paquets .deb à l'aide de #{debootstrap}# ou #{cdebootstrap}#, à partir des "
+"paquets .deb à l'aide de /{debootstrap}/ ou /{cdebootstrap}/, à partir des "
 "supports locaux ou à partir du réseau, résultant en un système Debian "
 "standard en cours d'installation sur le disque dur."
 
@@ -250,13 +244,6 @@ msgstr "*{Installateur Debian \"Live\" }*: C'est une image de Debian Live avec u
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:22
-#, fuzzy
-#| msgid ""
-#| "Installation will proceed in an identical fashion to the \"Regular\" "
-#| "installation described above, but at the actual package installation "
-#| "stage, instead of using #{debootstrap}# to fetch and install packages, "
-#| "the live filesystem image is copied to the target. This is achieved with "
-#| "a special udeb called live-installer."
 msgid ""
 "Installation will proceed in an identical fashion to the \"Regular\" "
 "installation described above, but at the actual package installation stage, "
@@ -266,7 +253,7 @@ msgid ""
 msgstr ""
 "L'installation se poursuit de manière identique à l'installation \"régulière"
 "\" décrite ci-dessus, mais à l'étape de l'installation des paquets, au lieu "
-"d'utiliser #{debootstrap}# pour aller chercher et installer des paquets, "
+"d'utiliser /{debootstrap}/ pour aller chercher et installer des paquets, "
 "l'image du système de fichiers live est copiée vers la cible. Ce résultat "
 "est obtenu avec un udeb spécial appelé «live-installer»."
 
@@ -282,10 +269,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:26
-#, fuzzy, no-wrap
-#| msgid "Note: to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#."
+#, no-wrap
 msgid "*{Note:}* to support both normal and live installer entries in the bootloader of the same live media, you must disable live-installer by preseeding #{live-installer/enable=false}#.\n"
-msgstr "Remarque: Pour soutenir les deux options: installateur normal et live dans le chargeur d'amorçage du même support live, vous devez désactiver «live-installer» en utilisant la préconfiguration #{live-installer/enable=false}#."
+msgstr "*{Remarque:}* Pour soutenir les deux options: installateur normal et live dans le chargeur d'amorçage du même support live, vous devez désactiver «live-installer» en utilisant la préconfiguration #{live-installer/enable=false}#."
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:28
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 014e880..969e9bf 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:10+0300\n"
 "PO-Revision-Date: 2012-03-17 19:13+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -221,17 +221,6 @@ msgstr "3~ Distribution, archive areas et mode"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:12
-#, fuzzy
-#| msgid ""
-#| "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:"
 msgid ""
 "The distribution you choose has the broadest impact on which packages are "
 "available to include in your live image. Specify the codename, which "
@@ -249,9 +238,9 @@ msgstr ""
 "Wheezy. Toute distribution actuelle dans l'archive Debian peut être spécifié "
 "par son nom de code ici. (Voir {Termes}#terms pour plus de détails.) "
 "L'option #{--distribution}# non seulement influence la source des paquets "
-"dans l'archive, mais aussi dit #{live-build}# comme it doit construire "
-"chaque distribution soutenue. Par exemple, pour construire contre *{unstable}"
-"*, Sid, précisez: "
+"dans l'archive, mais aussi dit live-build comme it doit construire chaque "
+"distribution soutenue. Par exemple, pour construire contre *{unstable}*, "
+"Sid, précisez: "
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:16
@@ -316,12 +305,12 @@ msgid ""
 "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."
+"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."
 msgstr ""
 "L'archive Debian est répliqué à travers un large réseau de miroirs autour du "
 "monde pour que les gens dans chaque région peuvent choisir un miroir proche "
@@ -329,8 +318,8 @@ msgstr ""
 "# qui régissent quel miroir de distribution est utilisée à différentes "
 "étapes de la construction. Rappelez-vous de {Étapes de la construction}"
 "#stages-of-the-build que l'étape *{bootstrap}* c'est quand le chroot est "
-"initialement peuplée par debootstrap avec un système minimal, et l'étape *"
-"{chroot}* c'est quand le chroot utilisé pour construire le système de "
+"initialement peuplée par /{debootstrap}/ avec un système minimal, et l'étape "
+"*{chroot}* c'est quand le chroot utilisé pour construire le système de "
 "fichiers du système live est construit. Ainsi, les commutateurs des miroirs "
 "correspondants sont utilisées pour ces étapes, et plus tard, dans l'étape *"
 "{binary}* les valeurs #{--mirror-binary}# et #{--mirror-binary-security}# "
@@ -805,12 +794,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:191
-#, fuzzy
-#| msgid ""
-#| "The primary tasks available in the Debian Installer can be listed with #"
-#| "{tasksel --list-tasks}# in the live system. The contents of any task, "
-#| "including ones not included in this list, may be examined with #{tasksel "
-#| "--task-packages}#."
 msgid ""
 "The primary tasks available in the Debian Installer can be listed with #"
 "{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -1234,13 +1217,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:294
-#, fuzzy
-#| msgid ""
-#| "This will not influence the entries in /etc/apt/sources.list, but merely "
-#| "whether /var/lib/apt contains the indices files or not. The tradeoff is "
-#| "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."
 msgid ""
 "This will not influence the entries in #{/etc/apt/sources.list}#, but merely "
 "whether #{/var/lib/apt}# contains the indices files or not. The tradeoff is "
@@ -1248,10 +1224,10 @@ msgid ""
 "before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
 "the user must #{apt-get update}# first to create those indices."
 msgstr ""
-"Cela ne influencera les entrées dans /etc/apt/sources.list, mais simplement "
-"de savoir si /var/lib/apt contient les fichiers indices ou non. La "
-"contrepartie est que APT a besoin de ces indices afin d'opérer dans le "
-"système live, alors avant de procéder à #{apt-cache search}# or #{apt-get "
+"Cela ne influencera les entrées dans #{/etc/apt/sources.list}#, mais "
+"simplement de savoir si #{/var/lib/apt}# contient les fichiers indices ou "
+"non. La contrepartie est que APT a besoin de ces indices afin d'opérer dans "
+"le système live, alors avant de procéder à #{apt-cache search}# or #{apt-get "
 "install}#, par exemple, l'utilisateur doit faire #{apt-get update}# pour "
 "créer ces indices."
 
diff --git a/manual/po/fr/user_customization-runtime.ssi.po b/manual/po/fr/user_customization-runtime.ssi.po
index 4afbf1d..be8e9ac 100644
--- a/manual/po/fr/user_customization-runtime.ssi.po
+++ b/manual/po/fr/user_customization-runtime.ssi.po
@@ -664,16 +664,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-runtime.ssi:164
-#, fuzzy
-#| msgid ""
-#| "Then we reboot. During the first boot the contents of /home and /var/"
-#| "cache/apt will be copied into the persistent volume, and from then on all "
-#| "changes to these directories will live in the persistent volume. Please "
-#| "note that any paths listed in the #{live.persist}# file cannot contain "
-#| "white spaces or the special \".\" and \"..\" path components. Also, "
-#| "neither \"/live\" (or any of its sub-directories) nor \"/\" can be made "
-#| "persistent using custom mounts (for the latter, use the #{full-ov}# type "
-#| "persistence described above)."
 msgid ""
 "Then we reboot. During the first boot the contents of #{/home}# and #{/var/"
 "cache/apt}# will be copied into the persistent volume, and from then on all "
@@ -684,13 +674,13 @@ msgid ""
 "using custom mounts (for the latter, use the #{full-ov}# type persistence "
 "described above)."
 msgstr ""
-"Alors nous redémarrons. Lors du premier démarrage les contenus du /home et /"
-"var/cache/apt seront copiés dans le volume persistant, et à partir de ce "
-"moment tous les changements dans ces répertoires seront stockés dans le "
-"volume persistant. S'il vous plaît souligner que les chemins d'accès aux "
+"Alors nous redémarrons. Lors du premier démarrage les contenus du #{/home}# "
+"et #{/var/cache/apt}# seront copiés dans le volume persistant, et à partir "
+"de ce moment tous les changements dans ces répertoires seront stockés dans "
+"le volume persistant. S'il vous plaît souligner que les chemins d'accès aux "
 "répertoriés dans le fichier #{live.persist}# ne peuvent pas contenir "
-"d'espaces blancs ou les éléments spéciaux \".\" et \"..\". En outre, ni \"/"
-"live\" (ou un de ses sous-répertoires), ni \"/\" peuvent être rendus "
+"d'espaces blancs ou les éléments spéciaux #{.}# et #{..}#. En outre, ni #{/"
+"live}# (ou un de ses sous-répertoires), ni #{/}#  peuvent être rendus "
 "persistants en utilisant custom mounts (pour ce dernier, utilisez la "
 "persistance #{full-ov}# décrite ci-dessus)."
 
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 6df08e8..9dcf71b 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:58+0300\n"
 "PO-Revision-Date: 2012-03-17 18:13+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -522,16 +522,12 @@ msgstr "3~ Deuxième révision"
 
 #. type: Plain text
 #: en/user_examples.ssi:137
-#, fuzzy
-#| 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."
 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 ""
 "Dans cette révision, nous allons nettoyer à partir de la première "
-"construction, ajouter le paquet #{vlc}# à notre configuration, reconstruire, "
+"construction, ajouter le paquet /{vlc}/ à notre configuration, reconstruire, "
 "tester et faire le commit."
 
 #. type: Plain text
@@ -556,15 +552,11 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:147
-#, fuzzy
-#| msgid ""
-#| "Now append the #{vlc}# package to our local package list in #{config/"
-#| "package-lists/my.list.chroot}#:"
 msgid ""
 "Now append the /{vlc}/ package to our local package list in #{config/package-"
 "lists/my.list.chroot}#:"
 msgstr ""
-"Maintenant ajouter le paquet #{vlc}# à votre liste de paquets local dans #"
+"Maintenant ajouter le paquet /{vlc}/ à votre liste de paquets local dans #"
 "{config/package-lists/my.list.chroot}#:"
 
 #. type: Plain text
@@ -641,19 +633,14 @@ msgstr "*{Cas d'utilisation:}* Créer une image avec live-build pour démarrer d
 
 #. type: Plain text
 #: en/user_examples.ssi:179
-#, fuzzy
-#| msgid ""
-#| "Make a build directory and create a skeletal configuration in it built "
-#| "around the standard-x11 list, including #{gdm3}#, #{metacity}# and #"
-#| "{xvnc4viewer}#, disabling recommends to make a minimal system:"
 msgid ""
 "Make a build directory and create a skeletal configuration in it built "
 "around the standard-x11 list, including /{gdm3}/, /{metacity}/ and /"
 "{xvnc4viewer}/, disabling recommends to make a minimal system:"
 msgstr ""
 "Faire un répertoire de construction et créer une configuration du squelette "
-"construit autour de la liste standard x11, avec #{gdm3}#, #{metacity}# et #"
-"{xvnc4viewer}#, désactivant «recommends» pour faire un système minimal:"
+"construit autour de la liste standard x11, avec /{gdm3}/, /{metacity}/ et /"
+"{xvnc4viewer}/, désactivant «recommends» pour faire un système minimal:"
 
 #. type: Plain text
 #: en/user_examples.ssi:187
@@ -668,19 +655,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:191
-#, fuzzy
-#| msgid ""
-#| "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it "
-#| "for the default user that will launch metacity and start xvncviewer, "
-#| "connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgid ""
 "Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
 "the default user that will launch /{metacity}/ and start /{xvncviewer}/, "
 "connecting to port #{5901}# on a server at #{192.168.1.2}#:"
 msgstr ""
 "Créez le répertoire #{/etc/skel}# avec une #{.xsession}# personnalisée pour "
-"l'utilisateur par défaut qui va lancer metacity et commencer xvncviewer, en "
-"reliant le port #{5901}# sur un serveur à  #{192.168.1.2}#:"
+"l'utilisateur par défaut qui va lancer /{metacity}/ et commencer /"
+"{xvncviewer}/, en reliant le port #{5901}# sur un serveur à  #{192.168.1.2}#:"
 
 #. type: Plain text
 #: en/user_examples.ssi:197
@@ -730,18 +712,6 @@ msgstr "*{Cas d'utilisation:}* Créer une image standard avec certains composant
 
 #. type: Plain text
 #: en/user_examples.ssi:221
-#, fuzzy
-#| msgid ""
-#| "When optimizing an image to fit a certain media size, you need to "
-#| "understand the tradeoffs you are making between size and functionality. "
-#| "In this example, we trim only so much as to make room for additional "
-#| "material within a 128M media size, but without doing anything to destroy "
-#| "integrity of the packages contained within, such as the purging of locale "
-#| "data via the #{localepurge}# package, or other such \"intrusive\" "
-#| "optimizations. Of particular note, you should not use #{--bootstrap-"
-#| "flavour minimal}# unless you really know what you're doing, as omitting "
-#| "priority #{important}# packages will most likely produce a broken live "
-#| "system."
 msgid ""
 "When optimizing an image to fit a certain media size, you need to understand "
 "the tradeoffs you are making between size and functionality. In this "
@@ -750,7 +720,7 @@ msgid ""
 "packages contained within, such as the purging of locale data via the /"
 "{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
 "packages will most likely produce a broken live system."
 msgstr ""
 "Lorsque l'optimisation d'une image adaptée à une dimension des certains "
@@ -758,11 +728,11 @@ msgstr ""
 "la taille et la fonctionnalité. Dans cet exemple, nous réduisons uniquement "
 "que pour faire place à du matériel supplémentaire au sein d'une taille de "
 "128M, mais sans rien faire pour détruire l'intégrité des paquets contenus, "
-"telles que la purge des données de localisation via le paquet #{localepurge}"
-"#, ou d'autres tels optimisations \"intrusives\". On notera en particulier, "
-"vous ne devriez pas utiliser #{--bootstrap-flavour minimal}# sauf si vous "
-"savez vraiment ce que vous faites, que l'omission de paquets de priorité #"
-"{importants}# produira probablement un système live cassé."
+"telles que la purge des données de localisation via le paquet /"
+"{localepurge}/, ou d'autres tels optimisations \"intrusives\". On notera en "
+"particulier, vous ne devriez pas utiliser #{--bootstrap-flavour minimal}# "
+"sauf si vous savez vraiment ce que vous faites, que l'omission de paquets de "
+"priorité #{importants}# produira probablement un système live cassé."
 
 #. type: Plain text
 #: en/user_examples.ssi:226
@@ -791,21 +761,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:240
-#, fuzzy
-#| msgid ""
-#| "The biggest space-saver here, compared to building a standard image on an "
-#| "#{i386}# architecture system, is to select only the #{486}# kernel "
-#| "flavour instead of the default #{-k \"486 686-pae\"}#. Leaving off APT's "
-#| "indices with #{--apt-indices false}# also saves a fair amount of space, "
-#| "the tradeoff being that you need to #{apt-get update}# before using apt "
-#| "in the live system. Choosing the #{minimal}# package list leaves out the "
-#| "large #{locales}# package and associated utilities. Dropping recommended "
-#| "packages with #{--apt-recommends false}# saves some additional space, at "
-#| "the expense of omitting some packages you might otherwise expect to be "
-#| "there, such as #{firmware-linux-free}# which may be needed to support "
-#| "certain hardware. The remaining options shave off additional small "
-#| "amounts of space. It's up to you to decide if the functionality that is "
-#| "sacrificed with each optimization is worth the loss in functionality."
 msgid ""
 "The biggest space-saver here, compared to building a standard image on an #"
 "{i386}# architecture system, is to select only the #{486}# kernel flavour "
@@ -831,7 +786,7 @@ msgstr ""
 "# et les services associés. Laissant hors les paquets recommandés avec #{--"
 "apt-recommends false}# économise de l'espace supplémentaire, au détriment "
 "d'omettre certains paquets vous pourriez autrement attendre à être là, tel "
-"que #{firmware-linux-free}# qui peuvent être nécessaires pour soutenir "
+"que /{firmware-linux-free}/ qui peuvent être nécessaires pour soutenir "
 "certains supports matériels. Les options restantes économisent petites "
 "quantités d'espace supplémentaires. C'est à vous de décider si la "
 "fonctionnalité qui est sacrifié avec chaque optimisation est en vaut la "
@@ -948,20 +903,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:292
-#, fuzzy
-#| 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 kernel, as it is currently necessary to make the installer "
-#| "and live system kernels match for the launcher to work properly."
 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 "
 "kernel, as it is currently necessary to make the installer and live system "
 "kernels match for the launcher to work properly."
 msgstr ""
-"Notez que nous avons inclus le paquet #{debian-installer-launcher}# pour "
-"lancer l'installateur à partir du bureau live, nous avons également précisé "
-"le noyau 486, parce qu'il est actuellement nécessaire faire que "
-"l'installateur et le noyau du systéme live coïncident pour que le lanceur "
-"fonctionne correctement."
+"Notez que nous avons inclus le paquet debian-installer-launcher pour lancer "
+"l'installateur à partir du bureau live, nous avons également précisé le "
+"noyau 486, parce qu'il est actuellement nécessaire faire que l'installateur "
+"et le noyau du systéme live coïncident pour que le lanceur fonctionne "
+"correctement."
diff --git a/manual/po/fr/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
index c358d6c..bd46faf 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -447,14 +447,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_installation.ssi:127
-#, fuzzy
-#| msgid ""
-#| "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
-#| "build #{live-boot}# for a target distribution that differs from your "
-#| "build system. For example, for Wheezy live images, build #{live-boot}# in "
-#| "a Wheezy chroot. If your target distribution happens to match your build "
-#| "system distribution, you may build directly on the build system using #"
-#| "{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):"
 msgid ""
 "Use a personal builder such as /{pbuilder}/ or /{sbuild}/ if you need to "
 "build live-boot for a target distribution that differs from your build "
@@ -464,9 +456,9 @@ msgid ""
 "buildpackage}# (provided by the /{dpkg-dev}/ package):"
 msgstr ""
 "Utilisez un système de construction automatique personnel tels que /"
-"{pbuilder}/ ou /{sbuild}/ si vous avez besoin pour créer #{live-boot}# pour "
-"une distribution objectif qui diffère de votre système de construction. Par "
-"exemple, pour les images live de Wheezy, créez #{live-boot}# dans un chroot "
+"{pbuilder}/ ou /{sbuild}/ si vous avez besoin pour créer live-boot pour une "
+"distribution objectif qui diffère de votre système de construction. Par "
+"exemple, pour les images live de Wheezy, créez live-boot dans un chroot "
 "Wheezy. Si votre distribution objectif correspond à votre distribution vous "
 "pouvez créer directement sur le système de construction en utilisant #{dpkg-"
 "buildpackage}# (fournis par le paquet /{dpkg-dev}/):"
diff --git a/manual/po/fr/user_overview.ssi.po b/manual/po/fr/user_overview.ssi.po
index bea4ac6..42707db 100644
--- a/manual/po/fr/user_overview.ssi.po
+++ b/manual/po/fr/user_overview.ssi.po
@@ -205,27 +205,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:14
-#, fuzzy
-#| msgid ""
-#| "Many concepts are similar to those in the debhelper Debian package tools "
-#| "written by Joey Hess:"
 msgid ""
 "Many concepts are similar to those in the /{debhelper}/ Debian package tools "
 "written by Joey Hess:"
 msgstr ""
-"Plusieurs concepts sont similaires à celles ceux dans le paquet Debian "
-"debhelper écrit par Joey Hess:"
+"Plusieurs concepts sont similaires à celles ceux dans le paquet Debian /"
+"{debhelper}/ écrit par Joey Hess:"
 
 #. type: Plain text
 #: en/user_overview.ssi:16
-#, fuzzy
-#| msgid ""
-#| "_* 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."
 msgid ""
 "_* The scripts have a central location for configuring their operation. In /"
 "{debhelper}/, this is the #{debian/}# subdirectory of a package tree. For "
@@ -235,8 +223,8 @@ msgid ""
 "under a #{config/}# subdirectory."
 msgstr ""
 "_* Les scripts ont un emplacement central pour la configuration de leur "
-"fonctionnement. Avec debhelper, c'est le sous-répertoire #{debian/}# d'un "
-"arbre de paquets. Par exemple, dh_install cherchera, entre autres, un "
+"fonctionnement. Avec /{debhelper}/, c'est le sous-répertoire #{debian/}# "
+"d'un arbre de paquets. Par exemple, dh_install cherchera, entre autres, un "
 "fichier appelé #{debian/install}# pour déterminer quels fichiers doivent "
 "exister dans un paquet binaire particulier. De la même manière, live-build "
 "enregistre son configuration entièrement sous un sous-répertoire #{config/}#."
@@ -252,19 +240,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_overview.ssi:20
-#, fuzzy
-#| msgid ""
-#| "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."
 msgid ""
 "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."
 msgstr ""
-"Contrairement à debhelper, live-build contient un outil pour générer un "
+"Contrairement à /{debhelper}/, live-build contient un outil pour générer un "
 "répertoire de configuration en squelette, #{lb config}#. Cela pourrait être "
 "considéré comme similaire à des outils tels que #{dh-make}#.  Pour plus "
 "d'informations à propos de #{lb config}#, s'il vous plaît voir {La commande "
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 32d7d60..4ad73f0 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:30+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"
@@ -649,8 +649,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
-msgstr "Per provare la ISO con #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
+msgstr "Per provare la ISO con /{virtualbox-ose}/:"
 
 #. type: Plain text
 #: en/user_basics.ssi:130
@@ -677,8 +677,8 @@ msgstr ""
 #. type: Plain text
 #: 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."
+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."
 
 #. type: Plain text
 #: en/user_basics.ssi:142
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index 3a8c149..0509cc3 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:10+0300\n"
 "PO-Revision-Date: 2012-04-03 18:01+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -238,8 +238,8 @@ msgstr ""
 "qualsiasi attuale distribuzione mantenuta negli archivi Debian può essere "
 "qui specificata con il suo nome in codice. (Per ulteriori dettagli "
 "consultare il {Glossario}#terms). L'opzione #{--distribution}# non solo "
-"influenza la sorgente dei pacchetti nell'archivio, ma indica a #{live-build}"
-"# di comportarsi secondo la necessità per compilare ciascuna distribuzione "
+"influenza la sorgente dei pacchetti nell'archivio, ma indica a live-build di "
+"comportarsi secondo la necessità per compilare ciascuna distribuzione "
 "supportata. Ad esempio se si vuole costruire un rilascio *{unstable}*, Sid, "
 "specificare:"
 
@@ -305,22 +305,22 @@ msgid ""
 "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."
+"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."
 msgstr ""
 "L'archivio Debian è replicato attraverso una vasta rete di mirror in tutto "
 "il mondo cosicché chiunque in ogni nazione può selezionare il mirror più "
 "vicino per la migliore velocità di scaricamento. Ciascuna delle opzioni #{--"
 "mirror-*}# determina quale mirror della distribuzione è usato nei vari stadi "
 "della compilazione. Ricordando dalle {Fasi della creazione}#stages-of-the-"
-"build che la fase di *{avvio}* è quando il chroot è inizialmente popolato da "
-"debootstrap con un sistema minimale e quella di *{chroot}* è quando viene "
-"creato il chroot usato per costruire il file system del sistema live. Perciò "
-"per queste fasi vengono usati i corrispondenti cambi di mirror, e in "
+"build che la fase di *{avvio}* è quando il chroot è inizialmente popolato "
+"da /{debootstrap}/ con un sistema minimale e quella di *{chroot}* è quando "
+"viene creato il chroot usato per costruire il file system del sistema live. "
+"Perciò per queste fasi vengono usati i corrispondenti cambi di mirror, e in "
 "seguito, nella fase *{binaria}* vengono usati i valori di #{--mirror-binary}"
 "# e #{--mirror-binary-security}# sostituendo qualsiasi altro mirror usato "
 "nelle fasi iniziali."
@@ -1211,11 +1211,11 @@ msgid ""
 "before performing #{apt-cache search}# or #{apt-get install}#, for instance, "
 "the user must #{apt-get update}# first to create those indices."
 msgstr ""
-"Questo non influenzerà le voci in /etc/apt/sources.list, determina solo se /"
-"var/lib/apt contiene o meno i file degli indici. Il compromesso è che APT "
-"necessita di quegli indici per operar enel sistema live, perciò prima di "
-"eseguire #{apt-cache search}# o #{apt-get install}#, per esempio, l'utente "
-"deve usare prima #{apt-get update}# per crearli."
+"Questo non influenzerà le voci in #{/etc/apt/sources.list}#, determina solo "
+"se /#{var/lib/apt}# contiene o meno i file degli indici. Il compromesso è "
+"che APT necessita di quegli indici per operar enel sistema live, perciò "
+"prima di eseguire #{apt-cache search}# o #{apt-get install}#, per esempio, "
+"l'utente deve usare prima #{apt-get update}# per crearli."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:296
diff --git a/manual/po/it/user_customization-runtime.ssi.po b/manual/po/it/user_customization-runtime.ssi.po
index 2c34589..aeb3684 100644
--- a/manual/po/it/user_customization-runtime.ssi.po
+++ b/manual/po/it/user_customization-runtime.ssi.po
@@ -692,7 +692,7 @@ msgstr ""
 "la superiore sarà montata per prima, per cui nessuna operazione di mount "
 "verrà sovrastata dall'altra. I mount nidificati personalizzati sono "
 "problematici se sono elencati nello stesso file #{live.persist}. Se si ha "
-"davvero la necessità (in genere non si dovrebbe averla :), consultare la "
+"davvero la necessità (in genere non si dovrebbe averla), consultare la "
 "manpage di live.persist(5) per sapere come gestire questo caso."
 
 #. type: Plain text
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 1ac8100..0e33377 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:58+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"
@@ -721,7 +721,7 @@ msgid ""
 "packages contained within, such as the purging of locale data via the /"
 "{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
 "packages will most likely produce a broken live system."
 msgstr ""
 "Quando si cerca di ottimizzare un'immagine affinché sia contenuta in un "
@@ -731,8 +731,8 @@ msgstr ""
 "distrugga l'integrità dei pacchetti contenuti, come eliminare localizzazioni "
 "con il pacchetto /{localepurge}/ o altre ottimizzazioni \"intrusive\". È da "
 "notare che non va usato #{--bootstrap-flavour minimal}# a meno che non si "
-"sappia cosa si sta facendo, come omettere la priorità dei pacchetti #"
-"{important}# che molto probabilmente produrrà un sistema live danneggiato."
+"sappia cosa si sta facendo, come omettere la priorità dei pacchetti *"
+"{important}* che molto probabilmente produrrà un sistema live danneggiato."
 
 #. type: Plain text
 #: en/user_examples.ssi:226
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 74f884d..cd1052c 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:30+0300\n"
 "PO-Revision-Date: 2010-10-20 06:53-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -525,7 +525,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
 msgstr ""
 
 #. type: Plain text
@@ -550,7 +550,7 @@ msgstr ""
 #. type: Plain text
 #: 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"
+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 ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index b481f49..262b33f 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:10+0300\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -263,12 +263,12 @@ msgid ""
 "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."
+"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."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index 97d2638..8607e89 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:58+0300\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -619,7 +619,7 @@ msgid ""
 "packages contained within, such as the purging of locale data via the /"
 "{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
 "packages will most likely produce a broken live system."
 msgstr ""
 
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 3d62358..96d64e1 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:30+0300\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -526,7 +526,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
 msgstr ""
 
 #. type: Plain text
@@ -551,7 +551,7 @@ msgstr ""
 #. type: Plain text
 #: 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"
+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 ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index d4284ea..af29015 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:10+0300\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -264,12 +264,12 @@ msgid ""
 "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."
+"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."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 5832fea..593d027 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:58+0300\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -620,7 +620,7 @@ msgid ""
 "packages contained within, such as the purging of locale data via the /"
 "{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
 "packages will most likely produce a broken live system."
 msgstr ""
 
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 7697649..14dfc93 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-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:30+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"
@@ -525,7 +525,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_basics.ssi:126
-msgid "In order to test the ISO with #{virtualbox-ose}#:"
+msgid "In order to test the ISO with /{virtualbox-ose}/:"
 msgstr ""
 
 #. type: Plain text
@@ -550,7 +550,7 @@ msgstr ""
 #. type: Plain text
 #: 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"
+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 ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 47d3c71..cabaaf6 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:10+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"
@@ -263,12 +263,12 @@ msgid ""
 "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."
+"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."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 69985d4..0db896a 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-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-04-08 14:58+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"
@@ -619,7 +619,7 @@ msgid ""
 "packages contained within, such as the purging of locale data via the /"
 "{localepurge}/ package, or other such \"intrusive\" optimizations. Of "
 "particular note, you should not use #{--bootstrap-flavour minimal}# unless "
-"you really know what you're doing, as omitting priority #{important}# "
+"you really know what you're doing, as omitting priority *{important}* "
 "packages will most likely produce a broken live system."
 msgstr ""
 
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index d66ad78..aa006c7 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -205,7 +205,7 @@ See the man pages for more details.
 
 3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
 
-In order to test the ISO with #{virtualbox-ose}#:
+In order to test the ISO with /{virtualbox-ose}/:
 
 code{
 
@@ -218,7 +218,7 @@ code{
 Create a new virtual machine, change the storage settings to use
 #{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
 
-*{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.
+*{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.
 
 code{
 
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index cdb8cac..ba7a292 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -65,10 +65,10 @@ 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
+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.
 
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index c91ed1a..81d18f6 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -287,7 +287,7 @@ a 128M media size, but without doing anything to destroy integrity of the
 packages contained within, such as the purging of locale data via the
 /{localepurge}/ package, or other such "intrusive" optimizations. Of
 particular note, you should not use #{--bootstrap-flavour minimal}# unless
-you really know what you're doing, as omitting priority #{important}#
+you really know what you're doing, as omitting priority *{important}*
 packages will most likely produce a broken live system.
 
 code{
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index d66ad78..aa006c7 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -205,7 +205,7 @@ See the man pages for more details.
 
 3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
 
-In order to test the ISO with #{virtualbox-ose}#:
+In order to test the ISO with /{virtualbox-ose}/:
 
 code{
 
@@ -218,7 +218,7 @@ code{
 Create a new virtual machine, change the storage settings to use
 #{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
 
-*{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.
+*{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.
 
 code{
 
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index cdb8cac..ba7a292 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -65,10 +65,10 @@ 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
+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.
 
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index c91ed1a..81d18f6 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -287,7 +287,7 @@ a 128M media size, but without doing anything to destroy integrity of the
 packages contained within, such as the purging of locale data via the
 /{localepurge}/ package, or other such "intrusive" optimizations. Of
 particular note, you should not use #{--bootstrap-flavour minimal}# unless
-you really know what you're doing, as omitting priority #{important}#
+you really know what you're doing, as omitting priority *{important}*
 packages will most likely produce a broken live system.
 
 code{

-- 
live-manual



More information about the debian-live-changes mailing list