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

chals chals at altorricon.com
Sun Jun 3 17:18:58 UTC 2012


The following commit has been merged in the debian-next branch:
commit 7b40b77571579e500d435845934993d721e25023
Author: chals <chals at altorricon.com>
Date:   Sun Jun 3 19:17:31 2012 +0200

    Updating 'es', 'fr' and 'it' translations after renaming binary-hybrid.iso and config/binary_debian-installer-includes.

diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index e842611..05401eb 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -87,7 +87,7 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network
-connection. When it is complete, there should be a #{binary-hybrid.iso}#
+connection. When it is complete, there should be a #{binary.hybrid.iso}#
 image file, ready to use, in the current directory.
 
 2~using-iso-hybrid Using an ISO hybrid live image
@@ -106,7 +106,7 @@ code{
 
  # apt-get install wodim
 
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
 
 }code
 
@@ -127,7 +127,7 @@ any previous contents on your stick!}*
 
 code{
 
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
 
 }code
 
@@ -197,7 +197,7 @@ Booting an ISO image is simple:
 
 code{
 
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
 
 }code
 
@@ -216,7 +216,7 @@ code{
 }code
 
 Create a new virtual machine, change the storage settings to use
-#{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
+#{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.
 
@@ -271,7 +271,7 @@ The generated binary image contains a VFAT partition and the syslinux
 bootloader, ready to be directly written on a USB stick. Since using an HDD
 image is just like using an ISO hybrid image on USB, follow the instructions
 in {Using an ISO hybrid live image}#using-iso-hybrid, except use the
-filename #{binary.img}# instead of #{binary-hybrid.iso}#.
+filename #{binary.img}# instead of #{binary.hybrid.iso}#.
 
 3~testing-hdd-with-qemu Testing an HDD image with Qemu
 
diff --git a/manual/de/user_customization-installer.ssi b/manual/de/user_customization-installer.ssi
index 4a10f2f..65f9860 100644
--- a/manual/de/user_customization-installer.ssi
+++ b/manual/de/user_customization-installer.ssi
@@ -84,4 +84,4 @@ built #{d-i}# component udeb packages. Place these in
 replacement files and directories may be included in the installer initrd as
 well, in a similar fashion to {Live/chroot local
 includes}#live-chroot-local-includes, by placing the material in
-#{config/binary_debian-installer-includes/}#.
+#{config/includes.binary_debian-installer/}#.
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 51b0f83..2b724dc 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -60,7 +60,7 @@ code{
 }code
 
 Assuming all goes well, after a while, the current directory will contain
-#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+#{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a
 virtual machine as described in {Testing an ISO image with
 Qemu}#testing-iso-with-qemu and {Testing an ISO image with
 virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index a37728a..df8728f 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -99,7 +99,7 @@ code{
 
 Este proceso puede llevar un tiempo, dependiendo de la velocidad de la
 conexión de red. Cuando haya terminado, debería haber un fichero
-#{binary-hybrid.iso}# listo para ser usado en el directorio actual.
+#{binary.hybrid.iso}# listo para ser usado en el directorio actual.
 
 2~using-iso-hybrid Usar una imagen ISO híbrida
 
@@ -117,7 +117,7 @@ code{
 
  # apt-get install wodim
 
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
 
 }code
 
@@ -141,7 +141,7 @@ definitiva cualquier contenido previo en la llave!}*
 
 code{
 
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
 
 }code
 
@@ -218,7 +218,7 @@ Arrancar una imagen ISO es sencillo:
 
 code{
 
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
 
 }code
 
@@ -237,7 +237,7 @@ code{
 }code
 
 Crear una nueva máquina virtual, cambiar la configuración de almacenamiento
-para utilizar #{binary-hybrid.iso}# como dispositivo CD/DVD y arrancar la
+para utilizar #{binary.hybrid.iso}# como dispositivo CD/DVD y arrancar la
 máquina.
 
 *{Nota:}* Para probar los sistemas en vivo con soporte X.org en /{virtualbox-ose}/, se puede incluir el paquete del driver de VirtualBox X.org, /{virtualbox-ose-guest-x11}/, en la configuración de live-build. De lo contrario, la resolución se limita a 800x600
@@ -293,7 +293,7 @@ arranque syslinux, lista para ser copiada directamente en un dispositivo
 USB. Dado que utilizar una imagen HDD es igual a usar una imagen ISO híbrida
 en un USB, seguir las instrucciones de {Usar una imagen ISO
 híbrida}#using-iso-hybrid con la diferencia de usar el nombre #{binary.img}#
-en lugar de #{binary-hybrid.iso}#.
+en lugar de #{binary.hybrid.iso}#.
 
 3~testing-hdd-with-qemu Probar una imágen HDD con Qemu
 
diff --git a/manual/es/user_customization-installer.ssi b/manual/es/user_customization-installer.ssi
index ea13eca..cd27cdd 100644
--- a/manual/es/user_customization-installer.ssi
+++ b/manual/es/user_customization-installer.ssi
@@ -89,4 +89,4 @@ directorio de configuración #{config/packages.binary/}#. También pueden
 incluirse o reemplazarse ficheros y directorios en el initrd del instalador
 de una manera similar a la que se describe en {Includes locales en
 Live/chroot}#live-chroot-local-includes, depositando el material en el
-directorio #{config/binary_debian-installer-includes/}#.
+directorio #{config/includes.binary_debian-installer/}#.
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index a46b4e8..28d711a 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -67,7 +67,7 @@ code{
 }code
 
 Suponiendo que todo va bien, después de un rato, el directorio actual
-contendrá #{binary-hybrid.iso}#. Esta imagen ISO híbrida se puede arrancar
+contendrá #{binary.hybrid.iso}#. Esta imagen ISO híbrida se puede arrancar
 directamente en una máquina virtual como se describe en {Probar una imagen
 ISO con Qemu}#testing-iso-with-qemu y en {Probar una imagen ISO con
 virtualbox-ose}#testing-iso-with-virtualbox o bien ser copiada a un medio
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index 43c9e57..f9b4232 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -99,7 +99,7 @@ code{
 
 Ce processus peut prendre un certain temps, en fonction de la vitesse de
 votre connexion réseau. Quand il est complet, il devrait y avoir un fichier
-image #{binary-hybrid.iso}# prêt à l'emploi, dans le répertoire courant.
+image #{binary.hybrid.iso}# prêt à l'emploi, dans le répertoire courant.
 
 2~using-iso-hybrid Utilisation d'une image ISO hybride live
 
@@ -117,7 +117,7 @@ code{
 
  # apt-get install wodim
 
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
 
 }code
 
@@ -139,7 +139,7 @@ déjà existant sur votre clé!}*
 
 code{
 
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
 
 }code
 
@@ -215,7 +215,7 @@ Démarrer une image ISO est simple:
 
 code{
 
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
 
 }code
 
@@ -234,7 +234,7 @@ code{
 }code
 
 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
+pour utiliser #{binary.hybrid.iso}# comme le périphérique CD/DVD et démarrer
 la machine.
 
 *{Remarque:}* Pour les systèmes live contenant X.org que vous voulez essayer avec /{virtualbox-ose}/, vous pouvez inclure le paquet des pilotes VirtualBox X.org, /{virtualbox-ose-guest-x11}/, dans votre configuration de live-build. Sinon, la résolution est limitée à 800x600.
@@ -290,7 +290,7 @@ démarrage syslinux, prêtes à être écrites directement sur une clé USB. Com
 l'utilisation d'une image HDD est juste comme l'utilisation d'une image ISO
 hybride sur USB, suivez les instructions {Utiliser une image live ISO
 hybride}#using-iso-hybrid, à l'exception du nom de fichier #{binary.img}# en
-lieu de #{binary-hybrid.iso}#.
+lieu de #{binary.hybrid.iso}#.
 
 3~testing-hdd-with-qemu Test d'une image HDD avec Qemu
 
diff --git a/manual/fr/user_customization-installer.ssi b/manual/fr/user_customization-installer.ssi
index b93b7c9..e4821c4 100644
--- a/manual/fr/user_customization-installer.ssi
+++ b/manual/fr/user_customization-installer.ssi
@@ -87,4 +87,4 @@ udeb #{d-i}# construits localement. Et les placer dans
 fichiers supplémentaires ou de remplacement et plusieurs répertoires peuvent
 être inclus dans l'initrd de l'installateur ainsi, d'une manière similaire à
 {Live/chroot local includes}#live-chroot-local-includes en plaçant le
-matériau dans #{config/binary_debian-installer-includes/}#. 
+matériau dans #{config/includes.binary_debian-installer/}#. 
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index cfd0419..cc169cb 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -67,7 +67,7 @@ code{
 }code
 
 En supposant que tout se passe bien, après un certain temps, le répertoire
-courant contiendra #{binary-hybrid.iso}#. Cette image ISO hybride peut être
+courant contiendra #{binary.hybrid.iso}#. Cette image ISO hybride peut être
 démarrée directement dans une machine virtuelle comme décrit dans {Test
 d'une image ISO avec QEMU}#testing-iso-with-qemu et {Test d'une image ISO
 avec virtualbox-ose}#testing-iso-with-virtualbox, ou bien copiée sur un
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index bc50c8a..b4ac2e8 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -96,7 +96,7 @@ code{
 
 Questo processo può richiedere tempo, a seconda della velocità della
 connessione di rete. Una volta completato, nell'attuale directory ci sarà un
-file immagine #{binary-hybrid.iso}# pronto da usare.
+file immagine #{binary.hybrid.iso}# pronto da usare.
 
 2~using-iso-hybrid Utilizzare un'immagine ISO live ibrida
 
@@ -114,7 +114,7 @@ code{
 
  # apt-get install wodim
 
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
 
 }code
 
@@ -136,7 +136,7 @@ presente su di essa!}*
 
 code{
 
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
 
 }code
 
@@ -208,7 +208,7 @@ Avviare un'immagine ISO è semplice:
 
 code{
 
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
 
 }code
 
@@ -227,7 +227,7 @@ code{
 }code
 
 Creare una nuova macchina virtuale, modificare le impostazione di
-archiviazione in modo da usare #{binary-hybrid.iso}# come dispositivo
+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.
@@ -283,7 +283,7 @@ syslinux, pronti per essere scritti direttamente su una penna USB. Dal
 momento che utilizzare un'immagine HDD è come utilizzare un'immagine ISO
 ibrida via USB, seguire le istruzioni contenute in {Utilizzare un'immagine
 live ISO ibrida}#using-iso-hybrid tenendo però conto che il nome del file
-sarà #{binary.img}# invece di #{binary-hybrid.iso}#.
+sarà #{binary.img}# invece di #{binary.hybrid.iso}#.
 
 3~testing-hdd-with-qemu Provare un'immagine HDD con Qemu
 
diff --git a/manual/it/user_customization-installer.ssi b/manual/it/user_customization-installer.ssi
index 27c4b00..2f90c0e 100644
--- a/manual/it/user_customization-installer.ssi
+++ b/manual/it/user_customization-installer.ssi
@@ -84,4 +84,4 @@ nell'immagine inserirli in #{config/packages.binary/}#. I file e le
 directory aggiuntivi o di rimpiazzo si possono includere nell'initrd
 dell'installatore in maniera simile agli {Include locali del
 Live/chroot}#live-chroot-local-includes, inserendo il materiale in
-#{config/binary_debian-installer-includes/}#.
+#{config/includes.binary_debian-installer/}#.
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 83f0b3e..d8f0dd5 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -62,7 +62,7 @@ code{
 }code
 
 Presupponendo che tutto vada per il verso giusto, dopo un po' la directory
-corrente conterrà #{binary-hybrid.iso}#. Questa immagine ISO ibrida può
+corrente conterrà #{binary.hybrid.iso}#. Questa immagine ISO ibrida può
 essere avviata direttamente in una macchina virtuale come descritto in
 {Provare un'immagine ISO con Qemu}#testing-iso-with-qemu e {Provare
 un'immagine ISO con virtualbox-ose}#testing-iso-with-virtualbox, oppure
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index a91b491..3009492 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-23 20:28+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -311,7 +311,7 @@ msgstr ""
 #: en/user_basics.ssi:48
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
 "image file, ready to use, in the current directory."
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:62
 #, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -382,7 +382,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:75
 #, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -507,7 +507,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:118
 #, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -540,7 +540,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:136
 msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
 "hybrid.iso}# as the CD/DVD device, and start the machine."
 msgstr ""
 
@@ -623,7 +623,7 @@ msgid ""
 "bootloader, ready to be directly written on a USB stick. Since using an HDD "
 "image is just like using an ISO hybrid image on USB, follow the instructions "
 "in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-installer.ssi.po b/manual/po/de/user_customization-installer.ssi.po
index 5430f04..24b3c5b 100644
--- a/manual/po/de/user_customization-installer.ssi.po
+++ b/manual/po/de/user_customization-installer.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,11 +16,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -87,11 +86,10 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -312,5 +310,5 @@ msgid ""
 "binary/}# to include them in the image. Additional or replacement files and "
 "directories may be included in the installer initrd as well, in a similar "
 "fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
 msgstr ""
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 9828f0f..20b9f9d 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -24,8 +24,7 @@ msgstr ":B~ Beispiele"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -95,8 +94,7 @@ msgstr ""
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -279,7 +277,7 @@ msgstr ""
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
 "virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
 "with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
 "virtualbox, or else imaged onto optical media or a USB flash device as "
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index 92056ef..49bd693 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-23 20:28+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+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"
@@ -382,11 +382,11 @@ msgstr " # lb build\n"
 #: en/user_basics.ssi:48
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
 "image file, ready to use, in the current directory."
 msgstr ""
 "Este proceso puede llevar un tiempo, dependiendo de la velocidad de la "
-"conexión de red. Cuando haya terminado, debería haber un fichero #{binary-"
+"conexión de red. Cuando haya terminado, debería haber un fichero #{binary."
 "hybrid.iso}# listo para ser usado en el directorio actual."
 
 #. type: Plain text
@@ -430,7 +430,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:62
 #, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -477,7 +477,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:75
 #, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -647,7 +647,7 @@ msgstr "Arrancar una imagen ISO es sencillo:"
 #. type: Plain text
 #: en/user_basics.ssi:118
 #, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -681,11 +681,11 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:136
 msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
 "hybrid.iso}# as the CD/DVD device, and start the machine."
 msgstr ""
 "Crear una nueva máquina virtual, cambiar la configuración de almacenamiento "
-"para utilizar #{binary-hybrid.iso}# como dispositivo CD/DVD y arrancar la "
+"para utilizar #{binary.hybrid.iso}# como dispositivo CD/DVD y arrancar la "
 "máquina."
 
 #. type: Plain text
@@ -780,14 +780,14 @@ msgid ""
 "bootloader, ready to be directly written on a USB stick. Since using an HDD "
 "image is just like using an ISO hybrid image on USB, follow the instructions "
 "in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
 msgstr ""
 "La imagen binaria generada contiene una partición VFAT y el gestor de "
 "arranque syslinux, lista para ser copiada directamente en un dispositivo "
 "USB. Dado que utilizar una imagen HDD es igual a usar una imagen ISO híbrida "
 "en un USB, seguir las instrucciones de {Usar una imagen ISO híbrida}#using-"
 "iso-hybrid con la diferencia de usar el nombre #{binary.img}# en lugar de #"
-"{binary-hybrid.iso}#."
+"{binary.hybrid.iso}#."
 
 #. type: Plain text
 #: en/user_basics.ssi:180
diff --git a/manual/po/es/user_customization-installer.ssi.po b/manual/po/es/user_customization-installer.ssi.po
index e14836b..3830477 100644
--- a/manual/po/es/user_customization-installer.ssi.po
+++ b/manual/po/es/user_customization-installer.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2012-03-19 20:54+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -23,11 +23,10 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -94,11 +93,10 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -359,7 +357,7 @@ msgid ""
 "binary/}# to include them in the image. Additional or replacement files and "
 "directories may be included in the installer initrd as well, in a similar "
 "fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
 msgstr ""
 "Es posible que, con propósitos experimentales o para depuración de errores, "
 "se desee incluir paquetes udeb creados localmente para el #{d-i}#. Estos "
@@ -369,4 +367,4 @@ msgstr ""
 "incluirse o reemplazarse ficheros y directorios en el initrd del instalador "
 "de una manera similar a la que se describe en {Includes locales en Live/"
 "chroot}#live-chroot-local-includes, depositando el material en el directorio "
-"#{config/binary_debian-installer-includes/}#."
+"#{config/includes.binary_debian-installer/}#."
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index 481f7e1..bb1fc64 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+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"
@@ -29,8 +29,7 @@ msgstr ":B~ Ejemplos"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -100,8 +99,7 @@ msgstr "code{"
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -313,7 +311,7 @@ msgstr ""
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
 "virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
 "with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
 "virtualbox, or else imaged onto optical media or a USB flash device as "
@@ -322,7 +320,7 @@ msgid ""
 "respectively."
 msgstr ""
 "Suponiendo que todo va bien, después de un rato, el directorio actual "
-"contendrá #{binary-hybrid.iso}#. Esta imagen ISO híbrida se puede arrancar "
+"contendrá #{binary.hybrid.iso}#. Esta imagen ISO híbrida se puede arrancar "
 "directamente en una máquina virtual como se describe en {Probar una imagen "
 "ISO con Qemu}#testing-iso-with-qemu y en {Probar una imagen ISO con "
 "virtualbox-ose}#testing-iso-with-virtualbox o bien ser copiada a un medio "
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index 3ae9eb9..4483ed0 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-23 20:28+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2012-04-28 11:39+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -377,12 +377,12 @@ msgstr ""
 #: en/user_basics.ssi:48
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
 "image file, ready to use, in the current directory."
 msgstr ""
 "Ce processus peut prendre un certain temps, en fonction de la vitesse de "
 "votre connexion réseau. Quand il est complet, il devrait y avoir un fichier "
-"image #{binary-hybrid.iso}# prêt à l'emploi, dans le répertoire courant."
+"image #{binary.hybrid.iso}# prêt à l'emploi, dans le répertoire courant."
 
 #. type: Plain text
 #: en/user_basics.ssi:50
@@ -425,7 +425,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:62
 #, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -470,7 +470,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:75
 #, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -639,7 +639,7 @@ msgstr "Démarrer une image ISO est simple:"
 #. type: Plain text
 #: en/user_basics.ssi:118
 #, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -673,11 +673,11 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:136
 msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
 "hybrid.iso}# as the CD/DVD device, and start the machine."
 msgstr ""
 "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 "
+"pour utiliser #{binary.hybrid.iso}# comme le périphérique CD/DVD et démarrer "
 "la machine."
 
 #. type: Plain text
@@ -772,14 +772,14 @@ msgid ""
 "bootloader, ready to be directly written on a USB stick. Since using an HDD "
 "image is just like using an ISO hybrid image on USB, follow the instructions "
 "in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
 msgstr ""
 "L'image binaire générée contient une partition VFAT et le chargeur de "
 "démarrage syslinux, prêtes à être écrites directement sur une clé USB. Comme "
 "l'utilisation d'une image HDD est juste comme l'utilisation d'une image ISO "
 "hybride sur USB, suivez les instructions {Utiliser une image live ISO "
 "hybride}#using-iso-hybrid, à l'exception du nom de fichier #{binary.img}# en "
-"lieu de #{binary-hybrid.iso}#."
+"lieu de #{binary.hybrid.iso}#."
 
 #. type: Plain text
 #: en/user_basics.ssi:180
diff --git a/manual/po/fr/user_customization-installer.ssi.po b/manual/po/fr/user_customization-installer.ssi.po
index ceaa982..74c2688 100644
--- a/manual/po/fr/user_customization-installer.ssi.po
+++ b/manual/po/fr/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2012-03-19 21:01+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -17,11 +17,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +87,10 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -353,7 +351,7 @@ msgid ""
 "binary/}# to include them in the image. Additional or replacement files and "
 "directories may be included in the installer initrd as well, in a similar "
 "fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
 msgstr ""
 "Pour des fins expérimentales ou de débogage, vous pouvez inclure paquets "
 "udeb #{d-i}# construits localement. Et les placer dans #{config/packages."
@@ -361,4 +359,4 @@ msgstr ""
 "ou de remplacement et plusieurs répertoires peuvent être inclus dans "
 "l'initrd de l'installateur ainsi, d'une manière similaire à {Live/chroot "
 "local includes}#live-chroot-local-includes en plaçant le matériau dans #"
-"{config/binary_debian-installer-includes/}#. "
+"{config/includes.binary_debian-installer/}#. "
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 81a2ee2..e353f71 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+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"
@@ -25,8 +25,7 @@ msgstr ":B~ Exemples"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -96,8 +95,7 @@ msgstr "code{"
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -309,7 +307,7 @@ msgstr ""
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
 "virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
 "with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
 "virtualbox, or else imaged onto optical media or a USB flash device as "
@@ -318,7 +316,7 @@ msgid ""
 "respectively."
 msgstr ""
 "En supposant que tout se passe bien, après un certain temps, le répertoire "
-"courant contiendra #{binary-hybrid.iso}#. Cette image ISO hybride peut être "
+"courant contiendra #{binary.hybrid.iso}#. Cette image ISO hybride peut être "
 "démarrée directement dans une machine virtuelle comme décrit dans {Test "
 "d'une image ISO avec QEMU}#testing-iso-with-qemu et {Test d'une image ISO "
 "avec virtualbox-ose}#testing-iso-with-virtualbox, ou bien copiée sur un "
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 6ba2c54..47e4bc8 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-23 20:28+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+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"
@@ -372,12 +372,12 @@ msgstr ""
 #: en/user_basics.ssi:48
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
 "image file, ready to use, in the current directory."
 msgstr ""
 "Questo processo può richiedere tempo, a seconda della velocità della "
 "connessione di rete. Una volta completato, nell'attuale directory ci sarà un "
-"file immagine #{binary-hybrid.iso}# pronto da usare."
+"file immagine #{binary.hybrid.iso}# pronto da usare."
 
 #. type: Plain text
 #: en/user_basics.ssi:50
@@ -420,7 +420,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:62
 #, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -465,7 +465,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:75
 #, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -630,7 +630,7 @@ msgstr "Avviare un'immagine ISO è semplice:"
 #. type: Plain text
 #: en/user_basics.ssi:118
 #, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -664,11 +664,11 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:136
 msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
 "hybrid.iso}# as the CD/DVD device, and start the machine."
 msgstr ""
 "Creare una nuova macchina virtuale, modificare le impostazione di "
-"archiviazione in modo da usare #{binary-hybrid.iso}# come dispositivo CD/"
+"archiviazione in modo da usare #{binary.hybrid.iso}# come dispositivo CD/"
 "DVD, e avviare la macchina."
 
 #. type: Plain text
@@ -763,14 +763,14 @@ msgid ""
 "bootloader, ready to be directly written on a USB stick. Since using an HDD "
 "image is just like using an ISO hybrid image on USB, follow the instructions "
 "in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
 msgstr ""
 "L'immagine binaria generata contiene una partizione VFAT e il bootloader "
 "syslinux, pronti per essere scritti direttamente su una penna USB. Dal "
 "momento che utilizzare un'immagine HDD è come utilizzare un'immagine ISO "
 "ibrida via USB, seguire le istruzioni contenute in {Utilizzare un'immagine "
 "live ISO ibrida}#using-iso-hybrid tenendo però conto che il nome del file "
-"sarà #{binary.img}# invece di #{binary-hybrid.iso}#."
+"sarà #{binary.img}# invece di #{binary.hybrid.iso}#."
 
 #. type: Plain text
 #: en/user_basics.ssi:180
diff --git a/manual/po/it/user_customization-installer.ssi.po b/manual/po/it/user_customization-installer.ssi.po
index d0d4212..ab558de 100644
--- a/manual/po/it/user_customization-installer.ssi.po
+++ b/manual/po/it/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2011-12-06 00:05+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -17,11 +17,10 @@ msgstr ""
 "Plural-Forms: nplurals=2: plural=(n !=1)\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +87,10 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -350,12 +348,12 @@ msgid ""
 "binary/}# to include them in the image. Additional or replacement files and "
 "directories may be included in the installer initrd as well, in a similar "
 "fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
 msgstr ""
 "Si può voler includere pacchetti udeb compilati localmente come componenti "
 "del #{d-i}# per scopi di sperimentazione o debug; per includerli "
 "nell'immagine inserirli in #{config/packages.binary/}#. I file e le "
 "directory aggiuntivi o di rimpiazzo si possono includere nell'initrd "
 "dell'installatore in maniera simile agli {Include locali del Live/chroot}"
-"#live-chroot-local-includes, inserendo il materiale in #{config/"
-"binary_debian-installer-includes/}#."
+"#live-chroot-local-includes, inserendo il materiale in #{config/includes."
+"binary_debian-installer/}#."
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index d3c33d9..12feec7 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2012-03-04 18:43+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -26,8 +26,7 @@ msgstr ":B~ Esempi"
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -97,8 +96,7 @@ msgstr "code{"
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -306,7 +304,7 @@ msgstr ""
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
 "virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
 "with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
 "virtualbox, or else imaged onto optical media or a USB flash device as "
@@ -315,7 +313,7 @@ msgid ""
 "respectively."
 msgstr ""
 "Presupponendo che tutto vada per il verso giusto, dopo un po' la directory "
-"corrente conterrà #{binary-hybrid.iso}#. Questa immagine ISO ibrida può "
+"corrente conterrà #{binary.hybrid.iso}#. Questa immagine ISO ibrida può "
 "essere avviata direttamente in una macchina virtuale come descritto in "
 "{Provare un'immagine ISO con Qemu}#testing-iso-with-qemu e {Provare "
 "un'immagine ISO con virtualbox-ose}#testing-iso-with-virtualbox, oppure "
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 708b78a..9168165 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-23 20:28+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2010-10-20 06:53-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -311,7 +311,7 @@ msgstr ""
 #: en/user_basics.ssi:48
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
 "image file, ready to use, in the current directory."
 msgstr ""
 
@@ -350,7 +350,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:62
 #, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -382,7 +382,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:75
 #, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -507,7 +507,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:118
 #, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -540,7 +540,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:136
 msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
 "hybrid.iso}# as the CD/DVD device, and start the machine."
 msgstr ""
 
@@ -623,7 +623,7 @@ msgid ""
 "bootloader, ready to be directly written on a USB stick. Since using an HDD "
 "image is just like using an ISO hybrid image on USB, follow the instructions "
 "in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-installer.ssi.po b/manual/po/pt_BR/user_customization-installer.ssi.po
index 1c4bc67..d7fd4ee 100644
--- a/manual/po/pt_BR/user_customization-installer.ssi.po
+++ b/manual/po/pt_BR/user_customization-installer.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2010-11-30 10:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,11 +16,10 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -87,11 +86,10 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -312,5 +310,5 @@ msgid ""
 "binary/}# to include them in the image. Additional or replacement files and "
 "directories may be included in the installer initrd as well, in a similar "
 "fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
 msgstr ""
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index fa0bb1d..1594f89 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -24,8 +24,7 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -95,8 +94,7 @@ msgstr "code{"
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -279,7 +277,7 @@ msgstr ""
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
 "virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
 "with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
 "virtualbox, or else imaged onto optical media or a USB flash device as "
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index fd41d2e..814e991 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-23 20:28+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2010-10-23 16:43+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -312,7 +312,7 @@ msgstr ""
 #: en/user_basics.ssi:48
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
 "image file, ready to use, in the current directory."
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:62
 #, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -383,7 +383,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:75
 #, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -508,7 +508,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:118
 #, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -541,7 +541,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:136
 msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
 "hybrid.iso}# as the CD/DVD device, and start the machine."
 msgstr ""
 
@@ -624,7 +624,7 @@ msgid ""
 "bootloader, ready to be directly written on a USB stick. Since using an HDD "
 "image is just like using an ISO hybrid image on USB, follow the instructions "
 "in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_customization-installer.ssi.po b/manual/po/ro/user_customization-installer.ssi.po
index d576667..e13029c 100644
--- a/manual/po/ro/user_customization-installer.ssi.po
+++ b/manual/po/ro/user_customization-installer.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-08 12:15+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2010-11-30 10:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,11 +17,10 @@ msgstr ""
 "20)) ? 1 : 2;\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +87,10 @@ msgid "code{"
 msgstr "code{"
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -313,5 +311,5 @@ msgid ""
 "binary/}# to include them in the image. Additional or replacement files and "
 "directories may be included in the installer initrd as well, in a similar "
 "fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
 msgstr ""
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 8437611..aab8dbd 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual\n"
-"POT-Creation-Date: 2012-04-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -25,8 +25,7 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -96,8 +95,7 @@ msgstr "code{"
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -280,7 +278,7 @@ msgstr ""
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
 "virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
 "with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
 "virtualbox, or else imaged onto optical media or a USB flash device as "
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 1724786..01f2345 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-23 20:28+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+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"
@@ -312,7 +312,7 @@ msgstr ""
 #: en/user_basics.ssi:48
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection. When it is complete, there should be a #{binary-hybrid.iso}# "
+"connection. When it is complete, there should be a #{binary.hybrid.iso}# "
 "image file, ready to use, in the current directory."
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:62
 #, no-wrap
-msgid " $ wodim binary-hybrid.iso\n"
+msgid " $ wodim binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -383,7 +383,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:75
 #, no-wrap
-msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
+msgid " $ dd if=binary.hybrid.iso of=${USBSTICK}\n"
 msgstr ""
 
 #. type: Plain text
@@ -508,7 +508,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:118
 #, no-wrap
-msgid " $ kvm -cdrom binary-hybrid.iso\n"
+msgid " $ kvm -cdrom binary.hybrid.iso\n"
 msgstr ""
 
 #. type: Plain text
@@ -541,7 +541,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_basics.ssi:136
 msgid ""
-"Create a new virtual machine, change the storage settings to use #{binary-"
+"Create a new virtual machine, change the storage settings to use #{binary."
 "hybrid.iso}# as the CD/DVD device, and start the machine."
 msgstr ""
 
@@ -624,7 +624,7 @@ msgid ""
 "bootloader, ready to be directly written on a USB stick. Since using an HDD "
 "image is just like using an ISO hybrid image on USB, follow the instructions "
 "in {Using an ISO hybrid live image}#using-iso-hybrid, except use the "
-"filename #{binary.img}# instead of #{binary-hybrid.iso}#."
+"filename #{binary.img}# instead of #{binary.hybrid.iso}#."
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-installer.ssi.pot b/manual/pot/user_customization-installer.ssi.pot
index e4b2330..0e8a77f 100644
--- a/manual/pot/user_customization-installer.ssi.pot
+++ b/manual/pot/user_customization-installer.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-06-03 19:00+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,11 +17,10 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:90 en/about_manual.ssi:98 en/about_manual.ssi:106
-#: en/about_manual.ssi:114 en/about_manual.ssi:122 en/about_manual.ssi:130
-#: en/about_manual.ssi:142 en/about_manual.ssi:155 en/about_manual.ssi:168
-#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/about_manual.ssi:195
-#: en/about_manual.ssi:203 en/project_bugs.ssi:60
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -88,11 +87,10 @@ msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:94 en/about_manual.ssi:102 en/about_manual.ssi:110
-#: en/about_manual.ssi:118 en/about_manual.ssi:126 en/about_manual.ssi:134
-#: en/about_manual.ssi:151 en/about_manual.ssi:164 en/about_manual.ssi:173
-#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/about_manual.ssi:199
-#: en/about_manual.ssi:207 en/project_bugs.ssi:64
+#: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
+#: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
+#: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -313,5 +311,5 @@ msgid ""
 "binary/}# to include them in the image. Additional or replacement files and "
 "directories may be included in the installer initrd as well, in a similar "
 "fashion to {Live/chroot local includes}#live-chroot-local-includes, by "
-"placing the material in #{config/binary_debian-installer-includes/}#."
+"placing the material in #{config/includes.binary_debian-installer/}#."
 msgstr ""
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index f2371cf..161036d 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-14 16:13+0300\n"
+"POT-Creation-Date: 2012-06-03 19:00+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -25,8 +25,7 @@ msgstr ""
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
 #: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
 #: en/about_manual.ssi:140 en/about_manual.ssi:153 en/about_manual.ssi:166
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
-#: en/about_manual.ssi:201 en/project_bugs.ssi:60
+#: en/about_manual.ssi:179 en/about_manual.ssi:187 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:30 en/project_coding-style.ssi:40
 #: en/project_coding-style.ssi:53 en/project_coding-style.ssi:63
 #: en/project_coding-style.ssi:94 en/project_coding-style.ssi:102
@@ -96,8 +95,7 @@ msgstr ""
 #: en/about_manual.ssi:92 en/about_manual.ssi:100 en/about_manual.ssi:108
 #: en/about_manual.ssi:116 en/about_manual.ssi:124 en/about_manual.ssi:132
 #: en/about_manual.ssi:149 en/about_manual.ssi:162 en/about_manual.ssi:171
-#: en/about_manual.ssi:181 en/about_manual.ssi:189 en/about_manual.ssi:197
-#: en/about_manual.ssi:205 en/project_bugs.ssi:64
+#: en/about_manual.ssi:183 en/about_manual.ssi:191 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:36 en/project_coding-style.ssi:47
 #: en/project_coding-style.ssi:59 en/project_coding-style.ssi:70
 #: en/project_coding-style.ssi:98 en/project_coding-style.ssi:106
@@ -280,7 +278,7 @@ msgstr ""
 #: en/user_examples.ssi:46
 msgid ""
 "Assuming all goes well, after a while, the current directory will contain #"
-"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a "
 "virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
 "with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
 "virtualbox, or else imaged onto optical media or a USB flash device as "
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index e842611..05401eb 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -87,7 +87,7 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network
-connection. When it is complete, there should be a #{binary-hybrid.iso}#
+connection. When it is complete, there should be a #{binary.hybrid.iso}#
 image file, ready to use, in the current directory.
 
 2~using-iso-hybrid Using an ISO hybrid live image
@@ -106,7 +106,7 @@ code{
 
  # apt-get install wodim
 
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
 
 }code
 
@@ -127,7 +127,7 @@ any previous contents on your stick!}*
 
 code{
 
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
 
 }code
 
@@ -197,7 +197,7 @@ Booting an ISO image is simple:
 
 code{
 
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
 
 }code
 
@@ -216,7 +216,7 @@ code{
 }code
 
 Create a new virtual machine, change the storage settings to use
-#{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
+#{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.
 
@@ -271,7 +271,7 @@ The generated binary image contains a VFAT partition and the syslinux
 bootloader, ready to be directly written on a USB stick. Since using an HDD
 image is just like using an ISO hybrid image on USB, follow the instructions
 in {Using an ISO hybrid live image}#using-iso-hybrid, except use the
-filename #{binary.img}# instead of #{binary-hybrid.iso}#.
+filename #{binary.img}# instead of #{binary.hybrid.iso}#.
 
 3~testing-hdd-with-qemu Testing an HDD image with Qemu
 
diff --git a/manual/pt_BR/user_customization-installer.ssi b/manual/pt_BR/user_customization-installer.ssi
index 4a10f2f..65f9860 100644
--- a/manual/pt_BR/user_customization-installer.ssi
+++ b/manual/pt_BR/user_customization-installer.ssi
@@ -84,4 +84,4 @@ built #{d-i}# component udeb packages. Place these in
 replacement files and directories may be included in the installer initrd as
 well, in a similar fashion to {Live/chroot local
 includes}#live-chroot-local-includes, by placing the material in
-#{config/binary_debian-installer-includes/}#.
+#{config/includes.binary_debian-installer/}#.
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index c5eb275..aa406ad 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -60,7 +60,7 @@ code{
 }code
 
 Assuming all goes well, after a while, the current directory will contain
-#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+#{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a
 virtual machine as described in {Testing an ISO image with
 Qemu}#testing-iso-with-qemu and {Testing an ISO image with
 virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index e842611..05401eb 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -87,7 +87,7 @@ code{
 }code
 
 This process can take a while, depending on the speed of your network
-connection. When it is complete, there should be a #{binary-hybrid.iso}#
+connection. When it is complete, there should be a #{binary.hybrid.iso}#
 image file, ready to use, in the current directory.
 
 2~using-iso-hybrid Using an ISO hybrid live image
@@ -106,7 +106,7 @@ code{
 
  # apt-get install wodim
 
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
 
 }code
 
@@ -127,7 +127,7 @@ any previous contents on your stick!}*
 
 code{
 
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
 
 }code
 
@@ -197,7 +197,7 @@ Booting an ISO image is simple:
 
 code{
 
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
 
 }code
 
@@ -216,7 +216,7 @@ code{
 }code
 
 Create a new virtual machine, change the storage settings to use
-#{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
+#{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.
 
@@ -271,7 +271,7 @@ The generated binary image contains a VFAT partition and the syslinux
 bootloader, ready to be directly written on a USB stick. Since using an HDD
 image is just like using an ISO hybrid image on USB, follow the instructions
 in {Using an ISO hybrid live image}#using-iso-hybrid, except use the
-filename #{binary.img}# instead of #{binary-hybrid.iso}#.
+filename #{binary.img}# instead of #{binary.hybrid.iso}#.
 
 3~testing-hdd-with-qemu Testing an HDD image with Qemu
 
diff --git a/manual/ro/user_customization-installer.ssi b/manual/ro/user_customization-installer.ssi
index 4a10f2f..65f9860 100644
--- a/manual/ro/user_customization-installer.ssi
+++ b/manual/ro/user_customization-installer.ssi
@@ -84,4 +84,4 @@ built #{d-i}# component udeb packages. Place these in
 replacement files and directories may be included in the installer initrd as
 well, in a similar fashion to {Live/chroot local
 includes}#live-chroot-local-includes, by placing the material in
-#{config/binary_debian-installer-includes/}#.
+#{config/includes.binary_debian-installer/}#.
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index c5eb275..aa406ad 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -60,7 +60,7 @@ code{
 }code
 
 Assuming all goes well, after a while, the current directory will contain
-#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+#{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a
 virtual machine as described in {Testing an ISO image with
 Qemu}#testing-iso-with-qemu and {Testing an ISO image with
 virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical

-- 
live-manual



More information about the debian-live-changes mailing list