[SCM] live-manual branch, debian-next, updated. debian/3.0_a8-1-30-gb76b9f4
Ben Armstrong
synrg at debian.org
Sun Nov 6 14:47:46 UTC 2011
The following commit has been merged in the debian-next branch:
commit b76b9f443abc4295023919f7afd814dfdb25138a
Author: Ben Armstrong <synrg at debian.org>
Date: Sun Nov 6 10:47:37 2011 -0400
Updating for 3.x, no virtual package lists and automatic tasksel desktop selection.
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 02e51ad..8860bc8 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -178,15 +178,6 @@ code{
}code
-In addition to these lists, live-build supports four virtual package lists:
-#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
-each of which provide a more extensive selection of packages that
-corresponds with Debian Installer defaults for these desktop
-environments. See {Desktop and language tasks}#desktop-and-language-tasks
-for more details.
-
-*{Note:}* The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.
-
The default location for the list files on your system is
#{/usr/share/live/build/package-lists/}#. To determine the packages in a
given list, read the corresponding file, paying attention to included files
@@ -341,9 +332,9 @@ code{
}code
Since desktop tasks are "internal" tasks, for every desktop flavour task
-included in the image, the corresponding value must be preseeded in the
-"tasksel/desktop" debconf variable or else tasksel will not recognize and
-install it. Thus:
+included in the image, the corresponding value, if it differs from the
+default, "gnome", must be preseeded in the "tasksel/desktop" debconf
+variable or else tasksel will not recognize and install it. Thus:
code{
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index a025b36..eb2dac8 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -332,10 +332,10 @@ preferred desktop, in this case KDE, containing all of the same packages
that would be installed by the standard Debian installer for KDE.
Our initial problem is the discovery of the names of the appropriate
-tasks. Currently, live-build cannot help with this. While we might get lucky
-and find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can
-be used to dig it out of the task descriptions in tasksel-data, so to
-prepare, make sure you have both of those things:
+language tasks. Currently, live-build cannot help with this. While we might
+get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#,
+which can be used to dig it out of the task descriptions in tasksel-data, so
+to prepare, make sure you have both of those things:
code{
@@ -372,11 +372,11 @@ code{
}code
-We will use the experimental #{--language}# option, as live-build happens to
-include #{syslinux}# templates for pt_BR (see {Desktop and language
-tasks}#desktop-and-language-tasks for details). And at boot time we will
-generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
-layout. Now let's put the pieces together:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
+"kde" so that tasksel will install the correct desktop task, as it differs
+from the default (see {Desktop and languages
+tasks}#desktop-and-language-tasks). Now let's put the pieces together:
code{
@@ -385,13 +385,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" >> \
- config/task-lists/my.list.chroot
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index b9dd28d..0c35b6b 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -103,10 +103,6 @@ code{
}code
-In addition to these lists, live-build supports four virtual package lists: #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, each of which provide a more extensive selection of packages that corresponds with Debian Installer defaults for these desktop environments. See {Desktop and language tasks}#desktop-and-language-tasks for more details.
-
-*{Note:}* The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.
-
The default location for the list files on your system is #{/usr/share/live/build/package-lists/}#. To determine the packages in a given list, read the corresponding file, paying attention to included files and conditionals as described in the following sections.
3~ Local package lists
@@ -209,7 +205,7 @@ code{
}code
-Since desktop tasks are "internal" tasks, for every desktop flavour task included in the image, the corresponding value must be preseeded in the "tasksel/desktop" debconf variable or else tasksel will not recognize and install it. Thus:
+Since desktop tasks are "internal" tasks, for every desktop flavour task included in the image, the corresponding value, if it differs from the default, "gnome", must be preseeded in the "tasksel/desktop" debconf variable or else tasksel will not recognize and install it. Thus:
code{
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index ce98deb..bf33758 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -244,7 +244,7 @@ The biggest space-saver here, compared to building a standard image on an #{i386
We want to make an iso-hybrid image for i386 architecture using our preferred desktop, in this case KDE, containing all of the same packages that would be installed by the standard Debian installer for KDE.
-Our initial problem is the discovery of the names of the appropriate tasks. Currently, live-build cannot help with this. While we might get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be used to dig it out of the task descriptions in tasksel-data, so to prepare, make sure you have both of those things:
+Our initial problem is the discovery of the names of the appropriate language tasks. Currently, live-build cannot help with this. While we might get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be used to dig it out of the task descriptions in tasksel-data, so to prepare, make sure you have both of those things:
code{
@@ -280,7 +280,7 @@ code{
}code
-We will use the experimental #{--language}# option, as live-build happens to include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}#desktop-and-language-tasks for details). And at boot time we will generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's put the pieces together:
+At boot time we will generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. We will also need to preseed our desktop choice, "kde" so that tasksel will install the correct desktop task, as it differs from the default (see {Desktop and languages tasks}#desktop-and-language-tasks). Now let's put the pieces together:
code{
@@ -289,13 +289,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" >> \
- config/task-lists/my.list.chroot
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index 10fb184..8a5d51e 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -199,15 +199,6 @@ code{
}code
-Además de estas listas, live-build soporta cuatro listas de paquetes
-virtuales, #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# y
-#{xfce-desktop}#, cada una de las cuales provee una selección de paquetes
-extensiva que corresponde con los valores por defecto del Instalador de
-Debian para estos entornos de escritorio. Para más información ver {Tareas
-de Escritorio e Idioma}#desktop-and-language-tasks .
-
-*{Nota:}* Existen imágenes listas para su descarga con los escritorios GNOME, KDE, LXDE y XFCE en http://live.debian.net. Estas imágenes han sido creadas utilizando la lista virtual #{*-desktop}# correspondiente.
-
La ubicación por defecto de las listas de los ficheros en el sistema huésped
es #{/usr/share/live/build/package-lists/}#. Para determinar qué paquetes
componen una lista dada se debe leer el correspondiente fichero poniendo
@@ -375,10 +366,10 @@ code{
}code
-Ya que las tareas de escritorio son "internas", para cada tarea de sabor de
-escritorio incluido en la imagen, el valor correspondiente tiene que ser
-preconfigurado en la variable "tasksel/desktop" de lo contrario tasksel no
-lo va a reconocer e instalar. Por lo tanto:
+Since desktop tasks are "internal" tasks, for every desktop flavour task
+included in the image, the corresponding value, if it differs from the
+default, "gnome", must be preseeded in the "tasksel/desktop" debconf
+variable or else tasksel will not recognize and install it. Thus:
code{
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index 4ac0174..e0f889d 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -354,11 +354,11 @@ escritorio preferido, en este caso el KDE, que contiene todos los mismos
paquetes que serían instalados por el programa de instalación estándar de
Debian para KDE.
-El primer problema es descubrir los nombres de las tareas adecuadas. En la
-actualidad, live-build no puede ayudar en esto. Aunque podríamos tener
-suerte y encontrarlos a base de pruebas, hay una herramienta,
-#{grep-dctrl}#, para extraerlos de las descripciones de tareas en
-tasksel-data, para prepararlos, asegurarse de tener ambas cosas:
+Our initial problem is the discovery of the names of the appropriate
+language tasks. Currently, live-build cannot help with this. While we might
+get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#,
+which can be used to dig it out of the task descriptions in tasksel-data, so
+to prepare, make sure you have both of those things:
code{
@@ -395,11 +395,11 @@ $ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.des
}code
-Se usará la opción experimental #{--language}#, ya que live-build incluye
-#{syslinux}# para pt_BR (ver {Tareas de Escritorio e
-Idioma}#desktop-and-language-tasks para más detalles). Y en el momento del
-arranque se generarán las variantes locales pt_BR.UTF-8 y se seleccionará el
-diseño del teclado pt-latin1. Ahora se ponen todas las piezas juntas:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
+"kde" so that tasksel will install the correct desktop task, as it differs
+from the default (see {Desktop and languages
+tasks}#desktop-and-language-tasks). Now let's put the pieces together:
code{
@@ -408,13 +408,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" >> \
- config/task-lists/my.list.chroot
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 8e691db..5170371 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -196,15 +196,6 @@ code{
}code
-En plus de ces listes, live-build soutient quatre listes de paquets
-virtuels: #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# et
-#{xfce-desktop}#, chacun d'entre eux offrent une sélection plus grande de
-paquets qui correspond à valeurs par défaut de l'installateur Debian pour
-ces environnements de bureau. Voir {Tâches de bureau et de la
-langue}#desktop-and-language-tasks pour plus de détails.
-
-*{Remarque:}* Les images préconstruites GNOME, KDE, LXDE et XFCE disponibles pour téléchargement à http://live.debian.net sont construites en utilisant les listes virtuels correspondantes #{*-desktop}#.
-
L'emplacement par défaut pour les fichiers liste sur votre système est
#{/usr/share/live/build/package-lists/}#. Pour déterminer les paquets dans
une liste donnée, lire le fichier correspondant, en accordant une attention
@@ -367,10 +358,10 @@ code{
}code
-Comme les tâches de bureau sont des tâches «internes», pour chaque tâche de
-saveur de bureau inclus dans l'image, la valeur correspondante doit être
-préconfiguré dans la variable debconf «tasksel/desktop", ou bien tasksel ne
-la reconnaîtra pas et ne l'installera pas. Ainsi:
+Since desktop tasks are "internal" tasks, for every desktop flavour task
+included in the image, the corresponding value, if it differs from the
+default, "gnome", must be preseeded in the "tasksel/desktop" debconf
+variable or else tasksel will not recognize and install it. Thus:
code{
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 79cdcd2..d1afefc 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -353,12 +353,11 @@ Nous voulons faire une image iso-hybride pour l'architecture i386 en
utilisant notre bureau préféré, dans ce cas, KDE, contenant tous les paquets
mêmes qui seraient installés par l'installateur Debian standard pour KDE.
-Notre premier problème est la découverte des noms des tâches
-appropriées. Actuellement, live-build ne peut pas aider. Alors que nous
-pourrions être chanceux et trouver ce par essais et erreurs, il y a un
-outil, #{grep-dctrl}#, qui peut être utilisé pour découvrir des descriptions
-de tâche dans tasksel-data, de sorte à préparer, assurez-vous que vous avez
-ces deux choses:
+Our initial problem is the discovery of the names of the appropriate
+language tasks. Currently, live-build cannot help with this. While we might
+get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#,
+which can be used to dig it out of the task descriptions in tasksel-data, so
+to prepare, make sure you have both of those things:
code{
@@ -395,12 +394,11 @@ code{
}code
-Nous allons utiliser l'option expérimentale #{--language}#, comme live-build
-inclut #{syslinux}# pour pt_BR (voir {Tâches de bureau et de la
-langue}#desktop-and-language-tasks pour plus de détails). Et au moment du
-démarrage nous allons générer les paramètres régionaux pt_BR.UTF-8 et
-sélectionner la configuration du clavier pt-latin1. Maintenant, nous allons
-mettre les pièces ensemble:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
+"kde" so that tasksel will install the correct desktop task, as it differs
+from the default (see {Desktop and languages
+tasks}#desktop-and-language-tasks). Now let's put the pieces together:
code{
@@ -409,13 +407,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" >> \
- config/task-lists/my.list.chroot
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index 3c7e93a..b0ed06b 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -185,15 +185,6 @@ code{
}code
-In aggiunta a questi elenchi, live-build ne gestisce quattro virtuali:
-#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
-ciascuno dei quali fornisce una selezione più estesa di pacchetti che
-corrisponde ai predefiniti dell'installatore Debian per ciascun ambiente
-desktop. Per ulteriori dettagli si veda {Task per desktop e
-lingua}#desktop-and-language-tasks.
-
-*{Nota:}* le immagini pre-costruite di GNOME, KDE, LXDE e XFCE disponibili per essere scaricate da http://live.debian.net sono costruite usando i corrispondenti elenchi #{*-desktop}# virtuali.
-
The default location for the list files on your system is
#{/usr/share/live/build/package-lists/}#. To determine the packages in a
given list, read the corresponding file, paying attention to included files
@@ -349,9 +340,9 @@ code{
}code
Since desktop tasks are "internal" tasks, for every desktop flavour task
-included in the image, the corresponding value must be preseeded in the
-"tasksel/desktop" debconf variable or else tasksel will not recognize and
-install it. Thus:
+included in the image, the corresponding value, if it differs from the
+default, "gnome", must be preseeded in the "tasksel/desktop" debconf
+variable or else tasksel will not recognize and install it. Thus:
code{
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 55f184f..d675f5b 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -345,11 +345,11 @@ nostro desktop preferito, in questo caso KDE, contenente tutti gli stessi
pacchetti che verrebbero installati dall'installatore Debian standard per
KDE.
-Il problema iniziale è di scoprire i nomi dei task appropriati, attualmente,
-live-build non aiuta in questo. Si può essere fortunati o arrivarci con vari
-tentativi, ma c'è uno strumento #{grep-dctrl}# il quale può essere
-utilizzato per scavare nelle descrizioni in tasksel-data, perciò assicursi
-di avere entrambi questi pacchetti:
+Our initial problem is the discovery of the names of the appropriate
+language tasks. Currently, live-build cannot help with this. While we might
+get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#,
+which can be used to dig it out of the task descriptions in tasksel-data, so
+to prepare, make sure you have both of those things:
code{
@@ -386,11 +386,11 @@ code{
}code
-Si userà l'opzione sperimentale #{--language}#, poiché live-build contempla
-i template #{syslinux}# per pt_BR (vedere {Task per desktop e
-lingua}#desktop-and-language-tasks per i dettagli). All'avvio verrà generata
-la lingua pt_BR.UTF-8 e selezionato pt-latin1 come layout della
-tastiera. Ora mettiamo insieme i pezzi:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
+"kde" so that tasksel will install the correct desktop task, as it differs
+from the default (see {Desktop and languages
+tasks}#desktop-and-language-tasks). Now let's put the pieces together:
code{
@@ -399,13 +399,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" >> \
- config/task-lists/my.list.chroot
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index b5316ab..7bf7e27 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: 2011-11-06 09:13-0400\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -42,20 +42,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -107,20 +107,20 @@ msgstr ""
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -133,7 +133,7 @@ msgstr ""
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -439,22 +439,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:107
msgid ""
-"In addition to these lists, live-build supports four virtual package lists: #"
-"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
-"each of which provide a more extensive selection of packages that "
-"corresponds with Debian Installer defaults for these desktop environments. "
-"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:109
-#, no-wrap
-msgid "*{Note:}* The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/package-lists/}#. To determine the packages in a given list, read the "
"corresponding file, paying attention to included files and conditionals as "
@@ -462,19 +446,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:111
msgid ""
"You may supplement the predefined lists using local package lists stored in #"
"{config/package-lists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:113
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -482,18 +466,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:115
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:117
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:119
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -504,12 +488,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:123
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
@@ -517,7 +501,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:125
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
@@ -525,7 +509,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -533,12 +517,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -549,14 +533,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -565,14 +549,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:152
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -581,7 +565,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -589,7 +573,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -598,12 +582,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -612,17 +596,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:182
msgid ""
"The Debian Installer offers the user choices of a number of preselected "
"lists of packages, each one focused on a particular kind of system, or task "
@@ -634,7 +618,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:187
#, no-wrap
msgid ""
" $ lb config\n"
@@ -642,7 +626,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:191
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -651,12 +635,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:195
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -670,7 +654,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:197
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -681,7 +665,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:199
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
@@ -691,7 +675,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:205
#, no-wrap
msgid ""
" $ lb config\n"
@@ -700,16 +684,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:209
msgid ""
"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value must be preseeded in the "
-"\"tasksel/desktop\" debconf variable or else tasksel will not recognize and "
-"install it. Thus:"
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:214
#, no-wrap
msgid ""
" $ lb config\n"
@@ -717,21 +701,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:218
msgid ""
"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
"\"."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:222
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -742,7 +726,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -753,22 +737,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:228
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:232
msgid ""
"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
"off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -776,12 +760,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:234
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:236
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -790,45 +774,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:238
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:240
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:244
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:250
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -836,7 +820,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:252
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -844,12 +828,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:256
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -859,7 +843,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:258
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -869,12 +853,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:262
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -885,12 +869,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:266
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -900,26 +884,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:268
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:270
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -927,18 +911,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:282
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:284
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -946,20 +930,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:286
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:290
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:294
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 "
@@ -969,20 +953,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:296
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:304
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -998,12 +982,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:308
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1012,12 +996,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1026,7 +1010,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:314
msgid ""
"Let's say you are building a Squeeze live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
@@ -1037,7 +1021,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:326
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
@@ -1048,7 +1032,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1058,18 +1042,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:343
+#: en/user_customization-packages.ssi:339
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
@@ -1082,7 +1066,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:349
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index ebde9fa..94fb4af 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: 2011-11-05 16:29-0200\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\n"
"PO-Revision-Date: 2011-04-23 14:15+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -47,20 +47,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -112,20 +112,20 @@ msgstr ""
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -138,7 +138,7 @@ msgstr ""
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -672,11 +672,11 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:248
msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
#. type: Plain text
@@ -731,15 +731,15 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:284
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -747,17 +747,16 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" >> \\\n"
-" config/task-lists/my.list.chroot\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:302
+#: en/user_examples.ssi:301
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 "
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index 8b92c9f..f2eb397 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: 2011-11-06 09:13-0400\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\n"
"PO-Revision-Date: 2011-11-06 14:25+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -49,20 +49,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -114,20 +114,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -140,7 +140,7 @@ msgstr "code{"
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -564,28 +564,6 @@ msgstr " $ lb config --package-lists \"gnome rescue\"\n"
#. type: Plain text
#: en/user_customization-packages.ssi:107
msgid ""
-"In addition to these lists, live-build supports four virtual package lists: #"
-"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
-"each of which provide a more extensive selection of packages that "
-"corresponds with Debian Installer defaults for these desktop environments. "
-"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
-msgstr ""
-"Además de estas listas, live-build soporta cuatro listas de paquetes "
-"virtuales, #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# y #{xfce-"
-"desktop}#, cada una de las cuales provee una selección de paquetes extensiva "
-"que corresponde con los valores por defecto del Instalador de Debian para "
-"estos entornos de escritorio. Para más información ver {Tareas de Escritorio "
-"e Idioma}#desktop-and-language-tasks ."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:109
-#, no-wrap
-msgid "*{Note:}* The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.\n"
-msgstr "*{Nota:}* Existen imágenes listas para su descarga con los escritorios GNOME, KDE, LXDE y XFCE en http://live.debian.net. Estas imágenes han sido creadas utilizando la lista virtual #{*-desktop}# correspondiente.\n"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/package-lists/}#. To determine the packages in a given list, read the "
"corresponding file, paying attention to included files and conditionals as "
@@ -598,12 +576,12 @@ msgstr ""
"describen a continuación."
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr "3~ Listas de paquetes locales"
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:111
msgid ""
"You may supplement the predefined lists using local package lists stored in #"
"{config/package-lists/}#."
@@ -613,7 +591,7 @@ msgstr ""
"lists/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:113
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -625,18 +603,18 @@ msgstr ""
"lista."
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:115
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr "*{Nota:}* Si no se especifica el sufijo, la lista será usada en las dos etapas. En consecuencia, es conveniente especificar #{.list.chroot}# de modo que los paquetes se instalen únicamente en el sistema en vivo y no exista otra copia extra del paquete #{.deb}# \n"
#. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:117
msgid "3~ Local binary package lists"
msgstr "3~ Listas de paquetes locales para binary"
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:119
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -654,12 +632,12 @@ msgstr ""
"con solamente añadir el sufijo #{.list}#"
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr "3~ Extensión de una lista de paquetes dada mediante «includes»"
#. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:123
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
@@ -671,7 +649,7 @@ msgstr ""
"escribir listas de paquetes."
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:125
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
@@ -683,7 +661,7 @@ msgstr ""
"contenido:"
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -693,12 +671,12 @@ msgstr ""
" iceweasel\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr "3~ Utilización de condiciones dentro de las listas de paquetes"
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -717,7 +695,7 @@ msgstr ""
"{ARCHIVE_AREAS}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
@@ -726,7 +704,7 @@ msgstr ""
"arquitectura amd64 (#{--architecture amd64}#) se puede utilizar:"
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -738,7 +716,7 @@ msgstr ""
" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:152
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
@@ -749,7 +727,7 @@ msgstr ""
"especificar:"
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -761,7 +739,7 @@ msgstr ""
" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -773,7 +751,7 @@ msgstr ""
"archive-areas}# se puede indicar:"
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -785,12 +763,12 @@ msgstr ""
" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr "Es habitual que una condición incluya una directiva «include»:"
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -802,17 +780,17 @@ msgstr ""
" #endif\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr "No se permite el anidamiento de estructuras condicionales."
#. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr "3~ Tareas"
#. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:182
msgid ""
"The Debian Installer offers the user choices of a number of preselected "
"lists of packages, each one focused on a particular kind of system, or task "
@@ -831,7 +809,7 @@ msgstr ""
"una lista en #{config/task-lists/}#, como en el ejemplo siguiente."
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:187
#, no-wrap
msgid ""
" $ lb config\n"
@@ -841,7 +819,7 @@ msgstr ""
" $ echo \"mail-server file-server\" >> config/task-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:191
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -855,12 +833,12 @@ msgstr ""
"obtenerse mediante la orden #{tasksel --task-packages}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr "3~desktop-and-language-tasks Tareas de Escritorio e Idioma"
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:195
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -884,7 +862,7 @@ msgstr ""
"correspondientes tareas del idioma."
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:197
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -902,7 +880,7 @@ msgstr ""
"comportamiento por defecto de live-build."
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:199
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
@@ -918,7 +896,7 @@ msgstr ""
"tareas:"
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:205
#, no-wrap
msgid ""
" $ lb config\n"
@@ -930,12 +908,18 @@ msgstr ""
" $ echo \"japanese japanese-desktop japanese-gnome-desktop\" >> config/task-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:209
+#, fuzzy
+#| msgid ""
+#| "Since desktop tasks are \"internal\" tasks, for every desktop flavour "
+#| "task included in the image, the corresponding value must be preseeded in "
+#| "the \"tasksel/desktop\" debconf variable or else tasksel will not "
+#| "recognize and install it. Thus:"
msgid ""
"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value must be preseeded in the "
-"\"tasksel/desktop\" debconf variable or else tasksel will not recognize and "
-"install it. Thus:"
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
"Ya que las tareas de escritorio son \"internas\", para cada tarea de sabor "
"de escritorio incluido en la imagen, el valor correspondiente tiene que ser "
@@ -943,7 +927,7 @@ msgstr ""
"lo va a reconocer e instalar. Por lo tanto:"
#. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:214
#, no-wrap
msgid ""
" $ lb config\n"
@@ -953,7 +937,7 @@ msgstr ""
" $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:218
msgid ""
"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
"\"."
@@ -962,7 +946,7 @@ msgstr ""
"lugar de \"kde\"."
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
@@ -971,7 +955,7 @@ msgstr ""
"o paquetes modificados"
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:222
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -989,7 +973,7 @@ msgstr ""
"paquetes «de terceros» para añadir funcionalidades a medida o propietarias."
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -1006,22 +990,22 @@ msgstr ""
"la creación de paquetes a medida."
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr "Existen dos formas de instalar paquetes personalizados:"
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:228
msgid "_* #{chroot_local-packages}#"
msgstr "_* #{chroot_local-packages}#"
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr "_* Utilizando un repositorio APT personalizado"
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:232
msgid ""
"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
"off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -1033,13 +1017,13 @@ msgstr ""
"repositorio APT personalizado es más lento de poner en marcha."
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:234
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
"3~ Método #{chroot_local-packages}# para instalar paquetes personalizados"
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:236
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -1053,7 +1037,7 @@ msgstr ""
"deben obtener los paquetes."
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:238
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
@@ -1062,7 +1046,7 @@ msgstr ""
"es usar #{dpkg-name}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:240
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
@@ -1071,12 +1055,12 @@ msgstr ""
"personalizados tiene desventajas:"
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr "_* No es posible utilizar APT seguro."
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:244
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
@@ -1085,7 +1069,7 @@ msgstr ""
"dependencias en el directorio #{config/chroot_local-packages/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
@@ -1094,12 +1078,12 @@ msgstr ""
"control de versiones."
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr "3~ Método de repositorio APT para instalar paquetes personalizados"
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:250
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -1111,7 +1095,7 @@ msgstr ""
"{Selección de los paquetes a instalar}#choosing-packages-to-install."
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:252
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -1122,12 +1106,12 @@ msgstr ""
"reutilizada posteriormente para ofrecer nuevas versiones de los paquetes."
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr "3~ Paquetes personalizados y APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:256
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -1142,7 +1126,7 @@ msgstr ""
"seleccionará para instalar el paquete con número de versión superior."
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:258
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -1158,12 +1142,12 @@ msgstr ""
"{APT pinning}#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr "2~ Configurar APT en la creación"
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:262
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -1182,12 +1166,12 @@ msgstr ""
"aquellas opciones que comienzan con #{apt}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr "3~choosing-apt-or-aptitude Utilizar apt o aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:266
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -1202,7 +1186,7 @@ msgstr ""
"manera de tratar los paquetes no disponibles."
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:268
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
@@ -1211,7 +1195,7 @@ msgstr ""
"instalación fallará. Es el comportamiento por defecto."
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:270
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
@@ -1220,12 +1204,12 @@ msgstr ""
"la instalación continuará sin error."
#. type: Plain text
-#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr "3~ Utilización de un proxy con APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -1236,18 +1220,18 @@ msgstr ""
"las opciones #{--apt-ftp-proxy}# o #{--apt-http-proxy}#. Por ejemplo:"
#. type: Plain text
-#: en/user_customization-packages.ssi:282
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr " $ lb config --apt-http-proxy http://proxy/\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr "3~ Ajuste de APT para ahorrar espacio"
#. type: Plain text
-#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:284
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -1257,7 +1241,7 @@ msgstr ""
"instalación. Las dos opciones descritas a continuación pueden ser de interes."
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:286
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
@@ -1266,13 +1250,13 @@ msgstr ""
"utilizar la siguiente opción:"
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:290
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr " $ lb config --binary-indices false\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:294
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 "
@@ -1289,7 +1273,7 @@ msgstr ""
"# o #{apt-get install}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:296
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
@@ -1299,13 +1283,13 @@ msgstr ""
"con:"
#. type: Plain text
-#: en/user_customization-packages.ssi:304
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr " $ lb config --apt-recommends false\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -1333,12 +1317,12 @@ msgstr ""
"explica en {APT pinning}#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr "3~ Pasar opciones a apt o a aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:308
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1352,12 +1336,12 @@ msgstr ""
"y #{aptitude}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr "3~apt-pinning APT pinning"
#. type: Plain text
-#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1371,7 +1355,7 @@ msgstr ""
"chroot_local-includes/etc/apt/preferences}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:314
msgid ""
"Let's say you are building a Squeeze live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
@@ -1389,7 +1373,7 @@ msgstr ""
"Esto se puede realizar de la siguiente forma:"
#. type: Plain text
-#: en/user_customization-packages.ssi:326
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
@@ -1405,7 +1389,7 @@ msgstr ""
" Pin-Priority: 600\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1419,18 +1403,18 @@ msgstr ""
" END\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr "*{Nota:}* Se pueden usar comodines en los nombres de los paquetes a fijar (p.ej. *{Package: live-*}*) si se usa una versión de apt igual o superior a 0.8.14. Esto significa que funciona con Wheezy usando:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr "$ lb config --distribution wheezy"
#. type: Plain text
-#: en/user_customization-packages.ssi:343
+#: en/user_customization-packages.ssi:339
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
@@ -1452,7 +1436,7 @@ msgstr ""
"con el siguiente contenido a #{config/chroot_apt/preferences}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:349
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index 91d364e..0dd526c 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: 2011-11-05 16:29-0200\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\n"
"PO-Revision-Date: 2011-11-06 12:02+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -52,20 +52,20 @@ msgstr ":B~ Ejemplos"
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -117,20 +117,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -143,7 +143,7 @@ msgstr "code{"
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -844,12 +844,19 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:248
-msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+#, fuzzy
+#| msgid ""
+#| "Our initial problem is the discovery of the names of the appropriate "
+#| "tasks. Currently, live-build cannot help with this. While we might get "
+#| "lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+#| "which can be used to dig it out of the task descriptions in tasksel-data, "
+#| "so to prepare, make sure you have both of those things:"
+msgid ""
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
"El primer problema es descubrir los nombres de las tareas adecuadas. En la "
"actualidad, live-build no puede ayudar en esto. Aunque podríamos tener "
@@ -924,34 +931,41 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:284
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
-msgstr ""
-"Se usará la opción experimental #{--language}#, ya que live-build incluye #"
-"{syslinux}# para pt_BR (ver {Tareas de Escritorio e Idioma}#desktop-and-"
-"language-tasks para más detalles). Y en el momento del arranque se generarán "
-"las variantes locales pt_BR.UTF-8 y se seleccionará el diseño del teclado pt-"
-"latin1. Ahora se ponen todas las piezas juntas:"
-
-#. type: Plain text
-#: en/user_examples.ssi:299
-#, no-wrap
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:298
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ mkdir live-pt_BR-kde\n"
+#| " $ cd live-pt_BR-kde\n"
+#| " $ lb config \\\n"
+#| " -a i386 \\\n"
+#| " -k 486 \\\n"
+#| " -p kde-desktop \\\n"
+#| " --language pt_BR \\\n"
+#| " --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
+#| " --debian-installer live\n"
+#| " $ echo \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" >> \\\n"
+#| " config/task-lists/my.list.chroot\n"
+#| " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
msgid ""
" $ mkdir live-pt_BR-kde\n"
" $ cd live-pt_BR-kde\n"
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" >> \\\n"
-" config/task-lists/my.list.chroot\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
" $ mkdir live-pt_BR-kde\n"
" $ cd live-pt_BR-kde\n"
@@ -967,7 +981,7 @@ msgstr ""
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
#. type: Plain text
-#: en/user_examples.ssi:302
+#: en/user_examples.ssi:301
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 "
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 68aea18..b9e09d7 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: 2011-11-06 09:13-0400\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\n"
"PO-Revision-Date: 2011-11-06 12:34+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -43,20 +43,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -108,20 +108,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -134,7 +134,7 @@ msgstr "code{"
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -548,28 +548,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:107
msgid ""
-"In addition to these lists, live-build supports four virtual package lists: #"
-"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
-"each of which provide a more extensive selection of packages that "
-"corresponds with Debian Installer defaults for these desktop environments. "
-"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
-msgstr ""
-"En plus de ces listes, live-build soutient quatre listes de paquets "
-"virtuels: #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# et #{xfce-"
-"desktop}#, chacun d'entre eux offrent une sélection plus grande de paquets "
-"qui correspond à valeurs par défaut de l'installateur Debian pour ces "
-"environnements de bureau. Voir {Tâches de bureau et de la langue}#desktop-"
-"and-language-tasks pour plus de détails."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:109
-#, no-wrap
-msgid "*{Note:}* The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.\n"
-msgstr "*{Remarque:}* Les images préconstruites GNOME, KDE, LXDE et XFCE disponibles pour téléchargement à http://live.debian.net sont construites en utilisant les listes virtuels correspondantes #{*-desktop}#.\n"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/package-lists/}#. To determine the packages in a given list, read the "
"corresponding file, paying attention to included files and conditionals as "
@@ -582,12 +560,12 @@ msgstr ""
"suivantes."
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr "3~ Listes de paquets locaux"
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:111
msgid ""
"You may supplement the predefined lists using local package lists stored in #"
"{config/package-lists/}#."
@@ -596,7 +574,7 @@ msgstr ""
"utilisant listes de paquets locaux stockées dans #{config/package-lists/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:113
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -607,18 +585,18 @@ msgstr ""
"{.chroot}# ou #{.binary}# pour indiquer à quelle étape la liste est destinée."
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:115
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr "*{Remarque:}* Si vous ne spécifiez pas le suffixe de l'étape, la liste sera utilisée pour les deux étapes. Normalement, vous voulez spécifier #{.list.chroot}# de sorte que les paquets seront seulement installés dans le système de fichiers live et ne pas avoir une copie supplémentaire du #{.deb}# placé sur le support.\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:117
msgid "3~ Local binary package lists"
msgstr "3~ Listes locaux de paquets binaires"
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:119
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -636,12 +614,12 @@ msgstr ""
"chroot, utilisez simplement le suffixe #{.list}#. "
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr "3~ Extension d'un liste de paquets fournis à l'aide de «includes»"
#. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:123
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
@@ -653,7 +631,7 @@ msgstr ""
"écrire vos propres listes."
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:125
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
@@ -664,7 +642,7 @@ msgstr ""
"contenu suivant:"
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -672,12 +650,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr "3~ Utilisant des conditionnels dans les listes de paquets"
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -695,7 +673,7 @@ msgstr ""
"{ARCHITECTURE}# ou #{ARCHIVE_AREAS}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
@@ -704,7 +682,7 @@ msgstr ""
"spécifié:"
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -713,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:152
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
@@ -723,7 +701,7 @@ msgstr ""
"amd64}# est spécifié:"
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -732,7 +710,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -743,7 +721,7 @@ msgstr ""
"free}# est spécifié via #{--archive-areas}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -752,12 +730,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr "Un conditionnel peut entourer une directive #{#include}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -766,17 +744,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr "L'imbrication des conditionnels n'est pas soutenu."
#. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr "3~ Tâches"
#. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:182
msgid ""
"The Debian Installer offers the user choices of a number of preselected "
"lists of packages, each one focused on a particular kind of system, or task "
@@ -796,7 +774,7 @@ msgstr ""
"l'exemple ci-dessous."
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:187
#, no-wrap
msgid ""
" $ lb config\n"
@@ -804,7 +782,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:191
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -817,12 +795,12 @@ msgstr ""
"être examinées avec #{tasksel --task-packages}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr "3~desktop-and-language-tasks Tâches de bureau et de la langue"
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:195
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -845,7 +823,7 @@ msgstr ""
"de l'installation influence le choix des tâches de la langue correspondante."
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:197
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -864,7 +842,7 @@ msgstr ""
"comportement par défaut de live-build."
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:199
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
@@ -880,7 +858,7 @@ msgstr ""
"tâches suivantes:"
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:205
#, no-wrap
msgid ""
" $ lb config\n"
@@ -889,12 +867,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:209
+#, fuzzy
+#| msgid ""
+#| "Since desktop tasks are \"internal\" tasks, for every desktop flavour "
+#| "task included in the image, the corresponding value must be preseeded in "
+#| "the \"tasksel/desktop\" debconf variable or else tasksel will not "
+#| "recognize and install it. Thus:"
msgid ""
"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value must be preseeded in the "
-"\"tasksel/desktop\" debconf variable or else tasksel will not recognize and "
-"install it. Thus:"
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
"Comme les tâches de bureau sont des tâches «internes», pour chaque tâche de "
"saveur de bureau inclus dans l'image, la valeur correspondante doit être "
@@ -902,7 +886,7 @@ msgstr ""
"la reconnaîtra pas et ne l'installera pas. Ainsi:"
#. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:214
#, no-wrap
msgid ""
" $ lb config\n"
@@ -910,7 +894,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:218
msgid ""
"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
"\"."
@@ -919,7 +903,7 @@ msgstr ""
"lieu de \"kde\"."
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
@@ -928,7 +912,7 @@ msgstr ""
"modifiés ou de tiers"
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:222
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -946,7 +930,7 @@ msgstr ""
"ajouter des fonctionnalités sur mesure et/ou propriétaires."
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -963,22 +947,22 @@ msgstr ""
"debian.org/doc/maint-guide/ et ailleurs"
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr "Il y a deux façons d'installer des paquets personnalisés modifiés:"
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:228
msgid "_* #{chroot_local-packages}#"
msgstr "_* #{chroot_local-packages}#"
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr "_* En utilisant un référentiel APT personnalisé"
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:232
msgid ""
"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
"off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -990,13 +974,13 @@ msgstr ""
"mettre en place."
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:234
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
"3~ Utilisant #{chroot_local-packages}# pour installer paquets personnalisés"
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:236
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -1009,7 +993,7 @@ msgstr ""
"construction du systéme - vous n'avez pas besoin de les spécifier ailleurs."
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:238
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
@@ -1018,7 +1002,7 @@ msgstr ""
"simple de le faire consiste à utiliser #{dpkg-name}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:240
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
@@ -1027,12 +1011,12 @@ msgstr ""
"personnalisés a des inconvénients:"
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr "_* Il n'est pas possible d'utiliser secure APT."
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:244
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
@@ -1041,7 +1025,7 @@ msgstr ""
"{config/chroot_local-packages/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
@@ -1050,13 +1034,13 @@ msgstr ""
"contrôle de révision."
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
"3~ Utilisant un référentiel APT pour installer des paquets personnalisés."
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:250
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -1068,7 +1052,7 @@ msgstr ""
"#choosing-packages-to-install pour plus de détails."
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:252
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -1079,12 +1063,12 @@ msgstr ""
"à une date ultérieure pour offrir les mises à jour des paquets modifiés."
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr "3~ Les paquets personnalisés et APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:256
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -1100,7 +1084,7 @@ msgstr ""
"supérieur."
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:258
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -1116,12 +1100,12 @@ msgstr ""
"plus d'informations."
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr "2~ Configuration d'APT au moment de la construction"
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:262
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -1138,12 +1122,12 @@ msgstr ""
"options commençant par #{apt}# dans la page de manuel de #{lb_config}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr "3~choosing-apt-or-aptitude Choisir apt ou aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:266
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -1157,7 +1141,7 @@ msgstr ""
"différence notable étant la manière dont les paquets manquants sont traitées."
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:268
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
@@ -1166,7 +1150,7 @@ msgstr ""
"l'installation va échouer. C'est le paramètre par défaut."
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:270
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
@@ -1175,12 +1159,12 @@ msgstr ""
"l'installation va réussir."
#. type: Plain text
-#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr "3~ Utilisation d'un proxy avec APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -1192,18 +1176,18 @@ msgstr ""
"nécessaire, par exemple"
#. type: Plain text
-#: en/user_customization-packages.ssi:282
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr "3~ Régler APT pour économiser de l'espace"
#. type: Plain text
-#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:284
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -1214,7 +1198,7 @@ msgstr ""
"d'intérêt."
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:286
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
@@ -1223,13 +1207,13 @@ msgstr ""
"pouvez omettre avec:"
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:290
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:294
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 "
@@ -1245,7 +1229,7 @@ msgstr ""
"créer ces indices."
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:296
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
@@ -1254,13 +1238,13 @@ msgstr ""
"image trop, vous pouvez désactiver l'option par défaut d'APT avec:"
#. type: Plain text
-#: en/user_customization-packages.ssi:304
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -1288,12 +1272,12 @@ msgstr ""
"#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr "3~ Passer des options à apt ou aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:308
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1307,12 +1291,12 @@ msgstr ""
"détails"
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr "3~apt-pinning APT pinning"
#. type: Plain text
-#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1326,7 +1310,7 @@ msgstr ""
"includes/etc/apt/preferences}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:314
msgid ""
"Let's say you are building a Squeeze live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
@@ -1343,7 +1327,7 @@ msgstr ""
"distribution du système cible, Squeeze. Ce qui suit devrait accomplir ça:"
#. type: Plain text
-#: en/user_customization-packages.ssi:326
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
@@ -1354,7 +1338,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1364,18 +1348,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr "*{Remarque:}* Caractères génériques peuvent être utilisés dans les noms des paquets (par exemple *{Package: live-*}*) avec la version 0.8.14 ou supérieure d'Apt. Cela signifie qu'il fonctionne avec Wheezy en utilisant:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:343
+#: en/user_customization-packages.ssi:339
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
@@ -1397,7 +1381,7 @@ msgstr ""
"preferences}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:349
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 42381bd..a11058c 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: 2011-11-05 16:29-0200\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\n"
"PO-Revision-Date: 2011-11-03 14:23+0100\n"
"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
"Language-Team: <debian-live at lists.debian.org>\n"
@@ -48,20 +48,20 @@ msgstr ":B~ Exemples"
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -113,20 +113,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -139,7 +139,7 @@ msgstr "code{"
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -804,12 +804,19 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:248
-msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+#, fuzzy
+#| msgid ""
+#| "Our initial problem is the discovery of the names of the appropriate "
+#| "tasks. Currently, live-build cannot help with this. While we might get "
+#| "lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+#| "which can be used to dig it out of the task descriptions in tasksel-data, "
+#| "so to prepare, make sure you have both of those things:"
+msgid ""
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
"Notre premier problème est la découverte des noms des tâches appropriées. "
"Actuellement, live-build ne peut pas aider. Alors que nous pourrions être "
@@ -873,21 +880,15 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:284
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
-"Nous allons utiliser l'option expérimentale #{--language}#, comme live-build "
-"inclut #{syslinux}# pour pt_BR (voir {Tâches de bureau et de la langue}"
-"#desktop-and-language-tasks pour plus de détails). Et au moment du démarrage "
-"nous allons générer les paramètres régionaux pt_BR.UTF-8 et sélectionner la "
-"configuration du clavier pt-latin1. Maintenant, nous allons mettre les "
-"pièces ensemble:"
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -895,17 +896,16 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" >> \\\n"
-" config/task-lists/my.list.chroot\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:302
+#: en/user_examples.ssi:301
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 "
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index 4361991..bfc2126 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: 2011-11-06 09:13-0400\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\n"
"PO-Revision-Date: 2011-08-02 00:53+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -44,20 +44,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -109,20 +109,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -135,7 +135,7 @@ msgstr "code{"
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -601,28 +601,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:107
-msgid ""
-"In addition to these lists, live-build supports four virtual package lists: #"
-"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
-"each of which provide a more extensive selection of packages that "
-"corresponds with Debian Installer defaults for these desktop environments. "
-"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
-msgstr ""
-"In aggiunta a questi elenchi, live-build ne gestisce quattro virtuali: #"
-"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
-"ciascuno dei quali fornisce una selezione più estesa di pacchetti che "
-"corrisponde ai predefiniti dell'installatore Debian per ciascun ambiente "
-"desktop. Per ulteriori dettagli si veda {Task per desktop e lingua}#desktop-"
-"and-language-tasks."
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:109
-#, no-wrap
-msgid "*{Note:}* The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.\n"
-msgstr "*{Nota:}* le immagini pre-costruite di GNOME, KDE, LXDE e XFCE disponibili per essere scaricate da http://live.debian.net sono costruite usando i corrispondenti elenchi #{*-desktop}# virtuali.\n"
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:111
#, fuzzy
#| msgid ""
#| "The default location for the list files on your system is #{/usr/share/"
@@ -641,12 +619,12 @@ msgstr ""
"come descritto nella sezioni seguenti."
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr "3~ Elenchi locali dei pacchetti"
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:111
#, fuzzy
#| msgid ""
#| "You may supplement or replace entirely the supplied lists using local "
@@ -659,7 +637,7 @@ msgstr ""
"locali dei pacchetti in #{config/chroot_local-packageslists/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:113
#, fuzzy
#| msgid ""
#| "Package lists that exist in this directory need to have a #{.list}# "
@@ -673,18 +651,18 @@ msgstr ""
"deve avere un suffisso #{.list}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:115
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:117
msgid "3~ Local binary package lists"
msgstr "3~ Elenchi locali di pacchetti binari"
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:119
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -695,12 +673,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr "3~ Estendere un'elenco di pacchetti usando gli include"
#. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:123
#, fuzzy
#| msgid ""
#| "The package lists that are included with live-build make extensive use of "
@@ -716,7 +694,7 @@ msgstr ""
"lists/}#, in quanto portano ottimi esempi su come scrivere i propri."
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:125
#, fuzzy
#| msgid ""
#| "For example, to make a list that includes the predefined #{gnome}# list "
@@ -732,7 +710,7 @@ msgstr ""
"con i seguenti contenuti:"
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -740,12 +718,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr "3~ Usare condizioni all'interno degli elenchi di pacchetti"
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -762,7 +740,7 @@ msgstr ""
"abbia senso, come #{DISTRIBUTION}#, #{ARCHITECTURE}# o #{ARCHIVE_AREAS}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
@@ -771,7 +749,7 @@ msgstr ""
"amd64}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -780,7 +758,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:152
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
@@ -790,7 +768,7 @@ msgstr ""
"architecture amd64}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -799,7 +777,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -810,7 +788,7 @@ msgstr ""
"free}# tramite #{--archive-areas}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -819,12 +797,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr "Una condizione può coinvolegere una direttiva #{#include}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -833,17 +811,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr "Le condizioni nidificate non sono supportate."
#. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr "3~ Task"
#. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:182
#, fuzzy
#| msgid ""
#| "The Debian Installer offers the user choices of a number of preselected "
@@ -870,7 +848,7 @@ msgstr ""
"#, come nell'esempio seguente."
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:187
#, no-wrap
msgid ""
" $ lb config\n"
@@ -878,7 +856,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:191
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -891,12 +869,12 @@ msgstr ""
"con #{tasksel --task-packages}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr "3~desktop-and-language-tasks Task per desktop e lingua"
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:195
#, fuzzy
#| msgid ""
#| "Desktop and language tasks are special cases. In the Debian Installer, if "
@@ -928,7 +906,7 @@ msgstr ""
"corrispondenti task della lingua."
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:197
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -939,7 +917,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:199
#, fuzzy
#| msgid ""
#| "First, there is no provision made yet automatically for language tasks, "
@@ -961,7 +939,7 @@ msgstr ""
"specificati nella configurazione. Per esempio:"
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:205
#, no-wrap
msgid ""
" $ lb config\n"
@@ -970,16 +948,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:209
msgid ""
"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value must be preseeded in the "
-"\"tasksel/desktop\" debconf variable or else tasksel will not recognize and "
-"install it. Thus:"
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:214
#, no-wrap
msgid ""
" $ lb config\n"
@@ -987,14 +965,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:218
msgid ""
"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
"\"."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
@@ -1003,7 +981,7 @@ msgstr ""
"modificati o di terze parti"
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:222
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -1020,7 +998,7 @@ msgstr ""
"utilizzati per aggiungere funzionalità proprietarie o su misura."
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -1037,22 +1015,22 @@ msgstr ""
"maint-guide/ e altrove."
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr "Ci sono due modi per installare pacchetti personalizzati:"
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:228
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr "_* Utilizzare repository APT personalizzati"
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:232
msgid ""
"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
"off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -1063,14 +1041,14 @@ msgstr ""
"repository APT personalizzato è più laborioso da configurare."
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:234
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
"3~ Utilizzare #{chroot_local-packages}# per installare pacchetti "
"personalizzati"
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:236
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -1083,7 +1061,7 @@ msgstr ""
"specificarli altrove."
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:238
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
@@ -1092,7 +1070,7 @@ msgstr ""
"semplice per farlo è usare #{dpkg-name}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:240
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
@@ -1101,12 +1079,12 @@ msgstr ""
"personalizzati presenta degli svantaggi:"
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr "_* non è possibile usare secure APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:244
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
@@ -1115,7 +1093,7 @@ msgstr ""
"chroot_local-packages/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
@@ -1124,13 +1102,13 @@ msgstr ""
"versione."
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
"3~ Utilizzare un repository APT per installare pacchetti personalizzati"
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:250
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -1142,7 +1120,7 @@ msgstr ""
"packages-to-install."
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:252
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -1153,12 +1131,12 @@ msgstr ""
"per offrire aggiornamenti dei pacchetti modificati."
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr "3~ Pacchetti personalizzati e APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:256
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -1173,7 +1151,7 @@ msgstr ""
"sceglie di installare quello con il numero di versione più alto."
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:258
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -1188,12 +1166,12 @@ msgstr ""
"veda {APT pinning}#apt-pinning per maggiori informazioni."
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr "2~ Configurare APT in fase di costruzione"
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:262
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -1210,12 +1188,12 @@ msgstr ""
"iniziano con #{apt}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr "3~choosing-apt-or-aptitude Scegliere apt o aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:266
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -1230,7 +1208,7 @@ msgstr ""
"quelli mancanti."
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:268
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
@@ -1239,7 +1217,7 @@ msgstr ""
"esito negativo; questo è l'impostazine predefinita."
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:270
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
@@ -1248,12 +1226,12 @@ msgstr ""
"avrà successo."
#. type: Plain text
-#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr "3~ Utilizzare un proxy con APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -1264,18 +1242,18 @@ msgstr ""
"ftp-proxy}# o #{--apt-http-proxy}# secondo necessità:"
#. type: Plain text
-#: en/user_customization-packages.ssi:282
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr "3~ Modificare APT per risparmiare spazio"
#. type: Plain text
-#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:284
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -1285,20 +1263,20 @@ msgstr ""
"in tal caso una o entrambe delle seguenti opzioni possono essere d'interesse."
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:286
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr "È possibile non includere gli indici di APT con:"
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:290
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:294
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 "
@@ -1313,7 +1291,7 @@ msgstr ""
"deve usare prima #{apt-get update}# per crearli."
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:296
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
@@ -1322,13 +1300,13 @@ msgstr ""
"troppo l'immagine, si può disabilitare l'opzione predefinita di APT con:"
#. type: Plain text
-#: en/user_customization-packages.ssi:304
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -1355,12 +1333,12 @@ msgstr ""
"spiegato in {APT pinning}#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr "3~ Passare opzioni ad apt o aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:308
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1373,12 +1351,12 @@ msgstr ""
"di #{apt}# e #{aptitude}# per i dettagli."
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr "3~apt-pinning APT pinning"
#. type: Plain text
-#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1391,7 +1369,7 @@ msgstr ""
"{config/chroot_local-includes/etc/apt/preferences}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:314
msgid ""
"Let's say you are building a Squeeze live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
@@ -1408,7 +1386,7 @@ msgstr ""
"servirà allo scopo:"
#. type: Plain text
-#: en/user_customization-packages.ssi:326
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
@@ -1419,7 +1397,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1429,18 +1407,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr "*{Nota:}* con la versione 0.8.14 o superiore di Apt si possono utilizzare wildcard nei nomi dei pacchetti (*{Package: live-*}*). Ciò significa che funziona con Wheezy usando:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:343
+#: en/user_customization-packages.ssi:339
#, fuzzy
#| msgid ""
#| "Negative pin priorities will prevent a package from being installed, as "
@@ -1471,7 +1449,7 @@ msgstr ""
"chroot_apt/preferences}# la seguente definizione:"
#. type: Plain text
-#: en/user_customization-packages.ssi:349
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 054d0aa..e3ccc93 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: 2011-11-05 16:29-0200\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\n"
"PO-Revision-Date: 2011-04-16 03:33+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -49,20 +49,20 @@ msgstr ":B~ Esempi"
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -114,20 +114,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -140,7 +140,7 @@ msgstr "code{"
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -819,12 +819,19 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:248
-msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+#, fuzzy
+#| msgid ""
+#| "Our initial problem is the discovery of the names of the appropriate "
+#| "tasks. Currently, live-build cannot help with this. While we might get "
+#| "lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+#| "which can be used to dig it out of the task descriptions in tasksel-data, "
+#| "so to prepare, make sure you have both of those things:"
+msgid ""
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
"Il problema iniziale è di scoprire i nomi dei task appropriati, attualmente, "
"live-build non aiuta in questo. Si può essere fortunati o arrivarci con vari "
@@ -886,20 +893,15 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:284
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
-"Si userà l'opzione sperimentale #{--language}#, poiché live-build contempla "
-"i template #{syslinux}# per pt_BR (vedere {Task per desktop e lingua}"
-"#desktop-and-language-tasks per i dettagli). All'avvio verrà generata la "
-"lingua pt_BR.UTF-8 e selezionato pt-latin1 come layout della tastiera. Ora "
-"mettiamo insieme i pezzi:"
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -907,17 +909,16 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" >> \\\n"
-" config/task-lists/my.list.chroot\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:302
+#: en/user_examples.ssi:301
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 "
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 7a2f593..f160554 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: 2011-11-06 09:13-0400\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -42,20 +42,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -107,20 +107,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -133,7 +133,7 @@ msgstr "code{"
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -439,22 +439,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:107
msgid ""
-"In addition to these lists, live-build supports four virtual package lists: #"
-"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
-"each of which provide a more extensive selection of packages that "
-"corresponds with Debian Installer defaults for these desktop environments. "
-"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:109
-#, no-wrap
-msgid "*{Note:}* The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/package-lists/}#. To determine the packages in a given list, read the "
"corresponding file, paying attention to included files and conditionals as "
@@ -462,19 +446,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:111
msgid ""
"You may supplement the predefined lists using local package lists stored in #"
"{config/package-lists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:113
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -482,18 +466,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:115
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:117
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:119
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -504,12 +488,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:123
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
@@ -517,7 +501,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:125
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
@@ -525,7 +509,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -533,12 +517,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -549,14 +533,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -565,14 +549,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:152
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -581,7 +565,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -589,7 +573,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -598,12 +582,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -612,17 +596,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:182
msgid ""
"The Debian Installer offers the user choices of a number of preselected "
"lists of packages, each one focused on a particular kind of system, or task "
@@ -634,7 +618,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:187
#, no-wrap
msgid ""
" $ lb config\n"
@@ -642,7 +626,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:191
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -651,12 +635,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:195
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -670,7 +654,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:197
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -681,7 +665,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:199
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
@@ -691,7 +675,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:205
#, no-wrap
msgid ""
" $ lb config\n"
@@ -700,16 +684,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:209
msgid ""
"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value must be preseeded in the "
-"\"tasksel/desktop\" debconf variable or else tasksel will not recognize and "
-"install it. Thus:"
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:214
#, no-wrap
msgid ""
" $ lb config\n"
@@ -717,21 +701,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:218
msgid ""
"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
"\"."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:222
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -742,7 +726,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -753,22 +737,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:228
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:232
msgid ""
"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
"off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -776,12 +760,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:234
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:236
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -790,45 +774,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:238
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:240
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:244
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:250
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -836,7 +820,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:252
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -844,12 +828,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:256
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -859,7 +843,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:258
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -869,12 +853,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:262
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -885,12 +869,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:266
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -900,26 +884,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:268
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:270
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -927,18 +911,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:282
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:284
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -946,20 +930,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:286
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:290
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:294
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 "
@@ -969,20 +953,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:296
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:304
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -998,12 +982,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:308
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1012,12 +996,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1026,7 +1010,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:314
msgid ""
"Let's say you are building a Squeeze live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
@@ -1037,7 +1021,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:326
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
@@ -1048,7 +1032,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1058,18 +1042,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:343
+#: en/user_customization-packages.ssi:339
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
@@ -1082,7 +1066,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:349
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index 75c1c42..f21bff1 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: 2011-11-05 16:29-0200\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -47,20 +47,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -112,20 +112,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -138,7 +138,7 @@ msgstr "code{"
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -672,11 +672,11 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:248
msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
#. type: Plain text
@@ -731,15 +731,15 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:284
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -747,17 +747,16 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" >> \\\n"
-" config/task-lists/my.list.chroot\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:302
+#: en/user_examples.ssi:301
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 "
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 12c606d..b255cf3 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: 2011-11-06 09:13-0400\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -43,20 +43,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -108,20 +108,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -134,7 +134,7 @@ msgstr "code{"
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -440,22 +440,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:107
msgid ""
-"In addition to these lists, live-build supports four virtual package lists: #"
-"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
-"each of which provide a more extensive selection of packages that "
-"corresponds with Debian Installer defaults for these desktop environments. "
-"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:109
-#, no-wrap
-msgid "*{Note:}* The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/package-lists/}#. To determine the packages in a given list, read the "
"corresponding file, paying attention to included files and conditionals as "
@@ -463,19 +447,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:111
msgid ""
"You may supplement the predefined lists using local package lists stored in #"
"{config/package-lists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:113
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -483,18 +467,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:115
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:117
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:119
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -505,12 +489,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:123
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
@@ -518,7 +502,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:125
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
@@ -526,7 +510,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -534,12 +518,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -550,14 +534,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -566,14 +550,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:152
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -582,7 +566,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -590,7 +574,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -599,12 +583,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -613,17 +597,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:182
msgid ""
"The Debian Installer offers the user choices of a number of preselected "
"lists of packages, each one focused on a particular kind of system, or task "
@@ -635,7 +619,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:187
#, no-wrap
msgid ""
" $ lb config\n"
@@ -643,7 +627,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:191
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -652,12 +636,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:195
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -671,7 +655,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:197
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -682,7 +666,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:199
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
@@ -692,7 +676,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:205
#, no-wrap
msgid ""
" $ lb config\n"
@@ -701,16 +685,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:209
msgid ""
"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value must be preseeded in the "
-"\"tasksel/desktop\" debconf variable or else tasksel will not recognize and "
-"install it. Thus:"
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:214
#, no-wrap
msgid ""
" $ lb config\n"
@@ -718,21 +702,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:218
msgid ""
"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
"\"."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:222
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -743,7 +727,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -754,22 +738,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:228
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:232
msgid ""
"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
"off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -777,12 +761,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:234
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:236
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -791,45 +775,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:238
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:240
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:244
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:250
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -837,7 +821,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:252
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -845,12 +829,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:256
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -860,7 +844,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:258
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -870,12 +854,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:262
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -886,12 +870,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:266
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -901,26 +885,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:268
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:270
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -928,18 +912,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:282
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:284
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -947,20 +931,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:286
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:290
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:294
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 "
@@ -970,20 +954,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:296
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:304
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -999,12 +983,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:308
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1013,12 +997,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1027,7 +1011,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:314
msgid ""
"Let's say you are building a Squeeze live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
@@ -1038,7 +1022,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:326
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
@@ -1049,7 +1033,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1059,18 +1043,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:343
+#: en/user_customization-packages.ssi:339
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
@@ -1083,7 +1067,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:349
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 3cad863..2815167 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: 2011-11-05 16:29-0200\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -48,20 +48,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -113,20 +113,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -139,7 +139,7 @@ msgstr "code{"
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -673,11 +673,11 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:248
msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
#. type: Plain text
@@ -732,15 +732,15 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:284
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -748,17 +748,16 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" >> \\\n"
-" config/task-lists/my.list.chroot\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:302
+#: en/user_examples.ssi:301
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 "
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 6b5aa7e..a97a4fd 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: 2011-11-06 09:13-0400\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\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"
@@ -42,20 +42,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -107,20 +107,20 @@ msgstr ""
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -133,7 +133,7 @@ msgstr ""
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -439,22 +439,6 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:107
msgid ""
-"In addition to these lists, live-build supports four virtual package lists: #"
-"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
-"each of which provide a more extensive selection of packages that "
-"corresponds with Debian Installer defaults for these desktop environments. "
-"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:109
-#, no-wrap
-msgid "*{Note:}* The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:111
-msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/package-lists/}#. To determine the packages in a given list, read the "
"corresponding file, paying attention to included files and conditionals as "
@@ -462,19 +446,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:113
+#: en/user_customization-packages.ssi:109
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:115
+#: en/user_customization-packages.ssi:111
msgid ""
"You may supplement the predefined lists using local package lists stored in #"
"{config/package-lists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
+#: en/user_customization-packages.ssi:113
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed, and then an additional stage suffix, #{.chroot}# "
@@ -482,18 +466,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:115
#, no-wrap
msgid "*{Note:}* If you don't specify the stage suffix, the list will be used for both stages. Normally, you want to specify #{.list.chroot}# so that the packages will only be installed in the live filesystem and not have an extra copy of the #{.deb}# placed on the media.\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:117
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:119
msgid ""
"To make a binary stage list, place a file suffixed with #{.list.binary}# in #"
"{config/package-lists/}#. These packages are not installed in the live "
@@ -504,12 +488,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:121
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:123
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/package-lists/}# "
@@ -517,7 +501,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:125
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/package-lists/my.list.chroot}# with the following "
@@ -525,7 +509,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:130
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -533,12 +517,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:134
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:136
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -549,14 +533,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:142
+#: en/user_customization-packages.ssi:138
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:148
+#: en/user_customization-packages.ssi:144
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -565,14 +549,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:152
+#: en/user_customization-packages.ssi:148
msgid ""
"You may test for any one of a number of values, e.g. to install #{memtest86+}"
"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:158
+#: en/user_customization-packages.ssi:154
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -581,7 +565,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:162
+#: en/user_customization-packages.ssi:158
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -589,7 +573,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:168
+#: en/user_customization-packages.ssi:164
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -598,12 +582,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:168
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:178
+#: en/user_customization-packages.ssi:174
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -612,17 +596,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:178
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:180
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:182
msgid ""
"The Debian Installer offers the user choices of a number of preselected "
"lists of packages, each one focused on a particular kind of system, or task "
@@ -634,7 +618,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:187
#, no-wrap
msgid ""
" $ lb config\n"
@@ -642,7 +626,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:191
msgid ""
"The primary tasks available in the Debian Installer can be listed with #"
"{tasksel --list-tasks}# in the live system. The contents of any task, "
@@ -651,12 +635,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:193
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:195
msgid ""
"Desktop and language tasks are special cases that need some extra planning "
"and configuration. Live images are different from Debian Installer images in "
@@ -670,7 +654,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:197
msgid ""
"When developing a desktop live image, the image typically boots directly to "
"a working desktop, the choices of both desktop and default language having "
@@ -681,7 +665,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:199
msgid ""
"Because there is no provision made automatically for language tasks, which "
"include such things as language-specific fonts and input-method packages, if "
@@ -691,7 +675,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:205
#, no-wrap
msgid ""
" $ lb config\n"
@@ -700,16 +684,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:209
msgid ""
"Since desktop tasks are \"internal\" tasks, for every desktop flavour task "
-"included in the image, the corresponding value must be preseeded in the "
-"\"tasksel/desktop\" debconf variable or else tasksel will not recognize and "
-"install it. Thus:"
+"included in the image, the corresponding value, if it differs from the "
+"default, \"gnome\", must be preseeded in the \"tasksel/desktop\" debconf "
+"variable or else tasksel will not recognize and install it. Thus:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:218
+#: en/user_customization-packages.ssi:214
#, no-wrap
msgid ""
" $ lb config\n"
@@ -717,21 +701,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:222
+#: en/user_customization-packages.ssi:218
msgid ""
"This parameter can take multiple values, e.g. \"lxde xfce\" instead of \"kde"
"\"."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:224
+#: en/user_customization-packages.ssi:220
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:226
+#: en/user_customization-packages.ssi:222
msgid ""
"Whilst it is against the philosophy of Debian Live, it may sometimes be "
"necessary to build a Live system with modified versions of packages that are "
@@ -742,7 +726,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:228
+#: en/user_customization-packages.ssi:224
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -753,22 +737,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:230
+#: en/user_customization-packages.ssi:226
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:232
+#: en/user_customization-packages.ssi:228
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:234
+#: en/user_customization-packages.ssi:230
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:236
+#: en/user_customization-packages.ssi:232
msgid ""
"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
"off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -776,12 +760,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:238
+#: en/user_customization-packages.ssi:234
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:240
+#: en/user_customization-packages.ssi:236
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -790,45 +774,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:242
+#: en/user_customization-packages.ssi:238
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:244
+#: en/user_customization-packages.ssi:240
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:246
+#: en/user_customization-packages.ssi:242
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:248
+#: en/user_customization-packages.ssi:244
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:250
+#: en/user_customization-packages.ssi:246
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:252
+#: en/user_customization-packages.ssi:248
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:254
+#: en/user_customization-packages.ssi:250
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -836,7 +820,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:256
+#: en/user_customization-packages.ssi:252
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -844,12 +828,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:258
+#: en/user_customization-packages.ssi:254
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:260
+#: en/user_customization-packages.ssi:256
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -859,7 +843,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:262
+#: en/user_customization-packages.ssi:258
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -869,12 +853,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:264
+#: en/user_customization-packages.ssi:260
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:266
+#: en/user_customization-packages.ssi:262
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -885,12 +869,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:268
+#: en/user_customization-packages.ssi:264
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:270
+#: en/user_customization-packages.ssi:266
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -900,26 +884,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:272
+#: en/user_customization-packages.ssi:268
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:274
+#: en/user_customization-packages.ssi:270
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:272
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:278
+#: en/user_customization-packages.ssi:274
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -927,18 +911,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:282
+#: en/user_customization-packages.ssi:278
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:286
+#: en/user_customization-packages.ssi:282
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:284
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -946,20 +930,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:290
+#: en/user_customization-packages.ssi:286
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:294
+#: en/user_customization-packages.ssi:290
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:294
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 "
@@ -969,20 +953,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:300
+#: en/user_customization-packages.ssi:296
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:304
+#: en/user_customization-packages.ssi:300
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:308
+#: en/user_customization-packages.ssi:304
msgid ""
"The tradeoff here is that if you don't install recommended packages for a "
"given package, that is, \"packages that would be found together with this "
@@ -998,12 +982,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:310
+#: en/user_customization-packages.ssi:306
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:312
+#: en/user_customization-packages.ssi:308
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -1012,12 +996,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:314
+#: en/user_customization-packages.ssi:310
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:312
msgid ""
"For background, please first read the #{apt_preferences(5)}# man page. APT "
"pinning can be configured either for build time, or else for run time. For "
@@ -1026,7 +1010,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:318
+#: en/user_customization-packages.ssi:314
msgid ""
"Let's say you are building a Squeeze live system but need all the live "
"packages that end up in the binary image to be installed from Sid at build "
@@ -1037,7 +1021,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:326
+#: en/user_customization-packages.ssi:322
#, no-wrap
msgid ""
" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
@@ -1048,7 +1032,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:327
#, no-wrap
msgid ""
" Package: *\n"
@@ -1058,18 +1042,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:335
+#: en/user_customization-packages.ssi:331
#, no-wrap
msgid "*{Note:}* Wildcards can be used in package names (e.g. *{Package: live-*}*) with Apt version 0.8.14 or higher. This means that it works with Wheezy using:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:339
+#: en/user_customization-packages.ssi:335
msgid "$ lb config --distribution wheezy"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:343
+#: en/user_customization-packages.ssi:339
msgid ""
"Negative pin priorities will prevent a package from being installed, as in "
"the case where you do not want a package that is recommended by another "
@@ -1082,7 +1066,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:349
+#: en/user_customization-packages.ssi:345
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index c958033..2ec939c 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: 2011-11-05 16:29-0200\n"
+"POT-Creation-Date: 2011-11-06 10:45-0400\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"
@@ -47,20 +47,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:54
#: en/user_customization-packages.ssi:67 en/user_customization-packages.ssi:81
#: en/user_customization-packages.ssi:101
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:144
-#: en/user_customization-packages.ssi:154
-#: en/user_customization-packages.ssi:164
-#: en/user_customization-packages.ssi:174
-#: en/user_customization-packages.ssi:188
-#: en/user_customization-packages.ssi:205
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:280
-#: en/user_customization-packages.ssi:292
-#: en/user_customization-packages.ssi:302
-#: en/user_customization-packages.ssi:320
-#: en/user_customization-packages.ssi:337
-#: en/user_customization-packages.ssi:345 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:150
+#: en/user_customization-packages.ssi:160
+#: en/user_customization-packages.ssi:170
+#: en/user_customization-packages.ssi:184
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:276
+#: en/user_customization-packages.ssi:288
+#: en/user_customization-packages.ssi:298
+#: en/user_customization-packages.ssi:316
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:341 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:24 en/user_customization-runtime.ssi:44
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:63
#: en/user_customization-runtime.ssi:71 en/user_customization-runtime.ssi:80
@@ -112,20 +112,20 @@ msgstr ""
#: en/user_customization-packages.ssi:46 en/user_customization-packages.ssi:59
#: en/user_customization-packages.ssi:71 en/user_customization-packages.ssi:85
#: en/user_customization-packages.ssi:105
-#: en/user_customization-packages.ssi:136
-#: en/user_customization-packages.ssi:150
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:193
-#: en/user_customization-packages.ssi:211
-#: en/user_customization-packages.ssi:220
-#: en/user_customization-packages.ssi:284
-#: en/user_customization-packages.ssi:296
-#: en/user_customization-packages.ssi:306
-#: en/user_customization-packages.ssi:333
-#: en/user_customization-packages.ssi:341
-#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:146
+#: en/user_customization-packages.ssi:156
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:216
+#: en/user_customization-packages.ssi:280
+#: en/user_customization-packages.ssi:292
+#: en/user_customization-packages.ssi:302
+#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:346 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:28 en/user_customization-runtime.ssi:48
#: en/user_customization-runtime.ssi:59 en/user_customization-runtime.ssi:67
#: en/user_customization-runtime.ssi:76 en/user_customization-runtime.ssi:85
@@ -138,7 +138,7 @@ msgstr ""
#: en/user_examples.ssi:169 en/user_examples.ssi:189 en/user_examples.ssi:205
#: en/user_examples.ssi:213 en/user_examples.ssi:228 en/user_examples.ssi:236
#: en/user_examples.ssi:254 en/user_examples.ssi:267 en/user_examples.ssi:282
-#: en/user_examples.ssi:301 en/user_installation.ssi:42
+#: en/user_examples.ssi:300 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
@@ -672,11 +672,11 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:248
msgid ""
-"Our initial problem is the discovery of the names of the appropriate tasks. "
-"Currently, live-build cannot help with this. While we might get lucky and "
-"find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can be "
-"used to dig it out of the task descriptions in tasksel-data, so to prepare, "
-"make sure you have both of those things:"
+"Our initial problem is the discovery of the names of the appropriate "
+"language tasks. Currently, live-build cannot help with this. While we might "
+"get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#, "
+"which can be used to dig it out of the task descriptions in tasksel-data, so "
+"to prepare, make sure you have both of those things:"
msgstr ""
#. type: Plain text
@@ -731,15 +731,15 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:284
msgid ""
-"We will use the experimental #{--language}# option, as live-build happens to "
-"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
-"#desktop-and-language-tasks for details). And at boot time we will generate "
-"the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's "
-"put the pieces together:"
+"At boot time we will generate the pt_BR.UTF-8 locale and select the pt-"
+"latin1 keyboard layout. We will also need to preseed our desktop choice, "
+"\"kde\" so that tasksel will install the correct desktop task, as it differs "
+"from the default (see {Desktop and languages tasks}#desktop-and-language-"
+"tasks). Now let's put the pieces together:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
#, no-wrap
msgid ""
" $ mkdir live-pt_BR-kde\n"
@@ -747,17 +747,16 @@ msgid ""
" $ lb config \\\n"
" -a i386 \\\n"
" -k 486 \\\n"
-" -p kde-desktop \\\n"
-" --language pt_BR \\\n"
" --bootappend-live \"locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1\" \\\n"
" --debian-installer live\n"
-" $ echo \"brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop\" >> \\\n"
-" config/task-lists/my.list.chroot\n"
+" $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \\\n"
+" brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot\n"
" $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+" $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:302
+#: en/user_examples.ssi:301
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 "
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 02e51ad..8860bc8 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -178,15 +178,6 @@ code{
}code
-In addition to these lists, live-build supports four virtual package lists:
-#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
-each of which provide a more extensive selection of packages that
-corresponds with Debian Installer defaults for these desktop
-environments. See {Desktop and language tasks}#desktop-and-language-tasks
-for more details.
-
-*{Note:}* The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.
-
The default location for the list files on your system is
#{/usr/share/live/build/package-lists/}#. To determine the packages in a
given list, read the corresponding file, paying attention to included files
@@ -341,9 +332,9 @@ code{
}code
Since desktop tasks are "internal" tasks, for every desktop flavour task
-included in the image, the corresponding value must be preseeded in the
-"tasksel/desktop" debconf variable or else tasksel will not recognize and
-install it. Thus:
+included in the image, the corresponding value, if it differs from the
+default, "gnome", must be preseeded in the "tasksel/desktop" debconf
+variable or else tasksel will not recognize and install it. Thus:
code{
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index a025b36..eb2dac8 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -332,10 +332,10 @@ preferred desktop, in this case KDE, containing all of the same packages
that would be installed by the standard Debian installer for KDE.
Our initial problem is the discovery of the names of the appropriate
-tasks. Currently, live-build cannot help with this. While we might get lucky
-and find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can
-be used to dig it out of the task descriptions in tasksel-data, so to
-prepare, make sure you have both of those things:
+language tasks. Currently, live-build cannot help with this. While we might
+get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#,
+which can be used to dig it out of the task descriptions in tasksel-data, so
+to prepare, make sure you have both of those things:
code{
@@ -372,11 +372,11 @@ code{
}code
-We will use the experimental #{--language}# option, as live-build happens to
-include #{syslinux}# templates for pt_BR (see {Desktop and language
-tasks}#desktop-and-language-tasks for details). And at boot time we will
-generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
-layout. Now let's put the pieces together:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
+"kde" so that tasksel will install the correct desktop task, as it differs
+from the default (see {Desktop and languages
+tasks}#desktop-and-language-tasks). Now let's put the pieces together:
code{
@@ -385,13 +385,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" >> \
- config/task-lists/my.list.chroot
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 02e51ad..8860bc8 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -178,15 +178,6 @@ code{
}code
-In addition to these lists, live-build supports four virtual package lists:
-#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
-each of which provide a more extensive selection of packages that
-corresponds with Debian Installer defaults for these desktop
-environments. See {Desktop and language tasks}#desktop-and-language-tasks
-for more details.
-
-*{Note:}* The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.
-
The default location for the list files on your system is
#{/usr/share/live/build/package-lists/}#. To determine the packages in a
given list, read the corresponding file, paying attention to included files
@@ -341,9 +332,9 @@ code{
}code
Since desktop tasks are "internal" tasks, for every desktop flavour task
-included in the image, the corresponding value must be preseeded in the
-"tasksel/desktop" debconf variable or else tasksel will not recognize and
-install it. Thus:
+included in the image, the corresponding value, if it differs from the
+default, "gnome", must be preseeded in the "tasksel/desktop" debconf
+variable or else tasksel will not recognize and install it. Thus:
code{
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index a025b36..eb2dac8 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -332,10 +332,10 @@ preferred desktop, in this case KDE, containing all of the same packages
that would be installed by the standard Debian installer for KDE.
Our initial problem is the discovery of the names of the appropriate
-tasks. Currently, live-build cannot help with this. While we might get lucky
-and find this by trial-and-error, there is a tool, #{grep-dctrl}#, which can
-be used to dig it out of the task descriptions in tasksel-data, so to
-prepare, make sure you have both of those things:
+language tasks. Currently, live-build cannot help with this. While we might
+get lucky and find this by trial-and-error, there is a tool, #{grep-dctrl}#,
+which can be used to dig it out of the task descriptions in tasksel-data, so
+to prepare, make sure you have both of those things:
code{
@@ -372,11 +372,11 @@ code{
}code
-We will use the experimental #{--language}# option, as live-build happens to
-include #{syslinux}# templates for pt_BR (see {Desktop and language
-tasks}#desktop-and-language-tasks for details). And at boot time we will
-generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard
-layout. Now let's put the pieces together:
+At boot time we will generate the pt_BR.UTF-8 locale and select the
+pt-latin1 keyboard layout. We will also need to preseed our desktop choice,
+"kde" so that tasksel will install the correct desktop task, as it differs
+from the default (see {Desktop and languages
+tasks}#desktop-and-language-tasks). Now let's put the pieces together:
code{
@@ -385,13 +385,12 @@ code{
$ lb config \
-a i386 \
-k 486 \
- -p kde-desktop \
- --language pt_BR \
--bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
--debian-installer live
- $ echo "brazilian-portuguese brazilian-portuguese-desktop brazilian-portuguese-kde-desktop" >> \
- config/task-lists/my.list.chroot
+ $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
+ brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
$ echo debian-installer-launcher >> config/package-lists/my.list.chroot
+ $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
}code
--
live-manual
More information about the debian-live-changes
mailing list