[SCM] live-manual branch, debian, updated. debian/3.0_a10-1-39-g216427c

chals chals at altorricon.com
Tue Apr 3 07:21:42 UTC 2012


The following commit has been merged in the debian branch:
commit 5e2573c2ae4a65d92f17e738b0d1775544327a02
Author: chals <chals at altorricon.com>
Date:   Mon Feb 13 15:03:23 2012 +0100

    Updating 'es' and 'fr', architectures.

diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index b0177ce..f35af57 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -248,15 +248,17 @@ code{
 
 3~ Utilización de condiciones dentro de las listas de paquetes
 
-Any of the live-build configuration variables stored in #{config/*}# (minus
-the #{LB_}# prefix) may be used in conditional statements in package
-lists. Generally, this means any #{lb config}# option uppercased and with
-dashes changed to underscores. But in practice, it is only the ones that
-influence package selection that make sense, such as #{DISTRIBUTION}#,
-#{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
-
-For example, to install #{ia32-libs}# if the #{--architectures amd64}# is
-specified:
+En las sentencias condicionales de las listas de paquetes pueden utilizarse
+cualquier variable disponible en #{config/*}# (excepto las que tienen el
+prefijo #{LB_}#). En general esto significa que puede utilizarse cualquier
+opción válida para #{lb config}# cambiando las letras minúsculas por
+mayúsculas y los guiones por subrayados. En la práctica solamente tiene
+sentido utilizar aquellas variables relacionadas con la selección de
+paquetes, como pueden ser #{DISTRIBUTION}#, #{ARCHITECTURES}# o
+#{ARCHIVE_AREAS}#.
+
+Por ejemplo, para instalar el paquete #{ia32-libs}# si se ha especificado la
+arquitectura amd64 (#{--architectures amd64}#) se puede utilizar:
 
 code{
 
@@ -266,9 +268,10 @@ code{
 
 }code
 
-You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architectures i386}# or #{--architectures
-amd64}# is specified:
+En la expresión condicional pueden utilizarse varios valores. Por ejemplo
+para instalar el paquete #{memtest86+}# si la arquitectura es i386
+(#{--architectures i386}#) o es amd64 (#{--architectures amd64}#) se puede
+especificar:
 
 code{
 
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index 7dfa328..e101018 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -156,12 +156,13 @@ code{
 
 }code
 
-First, #{--architectures i386}# ensures that on our #{amd64}# build system,
-we build a 32-bit version suitable for use on most machines. Second, we use
-#{--linux-flavours 686-pae}# because we don't anticipate using this image on
-much older systems. Third, we've chosen the #{lxde}# package list to give us
-a minimal desktop. And finally, we have added two initial favourite
-packages: #{iceweasel}# and #{xchat}#.
+En primer lugar con #{--architectures i386}# se asegura de que en nuestro
+sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para
+ser usada en la mayoría de máquinas. En segundo lugar, se usa
+#{--linux-flavours 686-pae}# porque no se espera usar esta imagen en
+sistemas mucho más viejos. En tercer lugar se elige la lista de paquetes
+#{lxde}# para proporcionar un escritorio mínimo. Y, por último, se añaden
+dos paquetes iniciales favoritos: #{iceweasel}# y #{xchat}#.
 
 Ahora, crear la imagen:
 
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 43b7436..3a9baf2 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -242,15 +242,16 @@ code{
 
 3~ Utilisant des conditionnels dans les listes de paquets
 
-Any of the live-build configuration variables stored in #{config/*}# (minus
-the #{LB_}# prefix) may be used in conditional statements in package
-lists. Generally, this means any #{lb config}# option uppercased and with
-dashes changed to underscores. But in practice, it is only the ones that
-influence package selection that make sense, such as #{DISTRIBUTION}#,
-#{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
+Toutes les variables de configuration de live-build stockées dans
+#{config/*}# (sans le préfixe #{LB_}#) peuvent être utilisés dans
+instructions conditionnelles dans les listes de paquets. Généralement, cela
+signifie une option #{lb config}# majuscule et avec tirets changées en
+caractères de soulignement. Mais en pratique, c'est seulement ceux qui
+influencent lasélection des paquets qui font sens, comme #{DISTRIBUTION}#,
+#{ARCHITECTURES}# ou #{ARCHIVE_AREAS}#.
 
-For example, to install #{ia32-libs}# if the #{--architectures amd64}# is
-specified:
+Par exemple, pour installer #{ia32-libs}# si la #{--architectures amd64}#
+est spécifié:
 
 code{
 
@@ -260,9 +261,9 @@ code{
 
 }code
 
-You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architectures i386}# or #{--architectures
-amd64}# is specified:
+Vous pouvez tester pour un certain nombre de valeurs, par exemple pour
+installer #{memtest86+}# si #{--architectures i386}# ou #{--architectures
+amd64}# est spécifié:
 
 code{
 
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 71690bd..d51139f 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -156,12 +156,14 @@ code{
 
 }code
 
-First, #{--architectures i386}# ensures that on our #{amd64}# build system,
-we build a 32-bit version suitable for use on most machines. Second, we use
-#{--linux-flavours 686-pae}# because we don't anticipate using this image on
-much older systems. Third, we've chosen the #{lxde}# package list to give us
-a minimal desktop. And finally, we have added two initial favourite
-packages: #{iceweasel}# and #{xchat}#.
+Tout d'abord, #{--architectures i386}# assure que sur notre système de
+construction #{amd64}#, nous construisons une version 32 bits qui peut être
+utilisé sur la plupart des machines. Deuxièmement, nous utilisons
+#{--linux-flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette
+image sur des systèmes beaucoup plus anciens. Troisièmement, nous avons
+choisi la liste des paquets #{lxde}# pour nous donner un bureau minimal. Et
+enfin, nous avons ajouté deux premiers paquets préférés: #{iceweasel}# et
+#{xchat}#.
 
 Maintenant, construire l'image:
 
diff --git a/manual/po/es/user_customization-installer.ssi.po b/manual/po/es/user_customization-installer.ssi.po
index b0a7096..ed291b4 100644
--- a/manual/po/es/user_customization-installer.ssi.po
+++ b/manual/po/es/user_customization-installer.ssi.po
@@ -302,17 +302,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:36
-#, fuzzy, no-wrap
-#| msgid ""
-#| " $ lb config --architecture i386 --linux-flavours 486 \\\n"
-#| "     --debian-installer live\n"
-#| " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
+#, no-wrap
 msgid ""
 " $ lb config --architectures i386 --linux-flavours 486 \\\n"
 "     --debian-installer live\n"
 " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
 msgstr ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
 "     --debian-installer live\n"
 " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
 
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index ef9b51c..f417329 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -681,14 +681,6 @@ msgstr "3~ Utilización de condiciones dentro de las listas de paquetes"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:136
-#, fuzzy
-#| msgid ""
-#| "Any of the live-build configuration variables stored in #{config/*}# "
-#| "(minus the #{LB_}# prefix) may be used in conditional statements in "
-#| "package lists. Generally, this means any #{lb config}# option uppercased "
-#| "and with dashes changed to underscores. But in practice, it is only the "
-#| "ones that influence package selection that make sense, such as #"
-#| "{DISTRIBUTION}#, #{ARCHITECTURE}# or #{ARCHIVE_AREAS}#."
 msgid ""
 "Any of the live-build configuration variables stored in #{config/*}# (minus "
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -703,45 +695,32 @@ msgstr ""
 "opción válida para #{lb config}# cambiando las letras minúsculas por "
 "mayúsculas y los guiones por subrayados. En la práctica solamente tiene "
 "sentido utilizar aquellas variables relacionadas con la selección de "
-"paquetes, como pueden ser #{DISTRIBUTION}#, #{ARCHITECTURE}# o #"
+"paquetes, como pueden ser #{DISTRIBUTION}#, #{ARCHITECTURES}# o #"
 "{ARCHIVE_AREAS}#."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:138
-#, fuzzy
-#| msgid ""
-#| "For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
-#| "specified:"
 msgid ""
 "For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
 "specified:"
 msgstr ""
 "Por ejemplo, para instalar el paquete #{ia32-libs}# si se ha especificado la "
-"arquitectura amd64 (#{--architecture amd64}#) se puede utilizar:"
+"arquitectura amd64 (#{--architectures amd64}#) se puede utilizar:"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:144
-#, fuzzy, no-wrap
-#| msgid ""
-#| " #if ARCHITECTURE amd64\n"
-#| " ia32-libs\n"
-#| " #endif\n"
+#, no-wrap
 msgid ""
 " #if ARCHITECTURES amd64\n"
 " ia32-libs\n"
 " #endif\n"
 msgstr ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " ia32-libs\n"
 " #endif\n"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:148
-#, fuzzy
-#| 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:"
 msgid ""
 "You may test for any one of a number of values, e.g. to install #{memtest86+}"
 "# if either #{--architectures i386}# or #{--architectures amd64}# is "
@@ -749,22 +728,18 @@ msgid ""
 msgstr ""
 "En la expresión condicional pueden utilizarse varios valores. Por ejemplo "
 "para instalar el paquete #{memtest86+}# si la arquitectura es i386 (#{--"
-"architecture i386}#) o es amd64 (#{--architecture amd64}#) se puede "
+"architectures i386}#) o es amd64 (#{--architectures amd64}#) se puede "
 "especificar:"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:154
-#, fuzzy, no-wrap
-#| msgid ""
-#| " #if ARCHITECTURE i386 amd64\n"
-#| " memtest86+\n"
-#| " #endif\n"
+#, no-wrap
 msgid ""
 " #if ARCHITECTURES i386 amd64\n"
 " memtest86+\n"
 " #endif\n"
 msgstr ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
 " memtest86+\n"
 " #endif\n"
 
@@ -799,17 +774,13 @@ msgstr "Es habitual que una condición incluya una directiva «include»:"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:174
-#, fuzzy, no-wrap
-#| msgid ""
-#| " #if ARCHITECTURE amd64\n"
-#| " #include <gnome-full>\n"
-#| " #endif\n"
+#, no-wrap
 msgid ""
 " #if ARCHITECTURES amd64\n"
 " #include <gnome-full>\n"
 " #endif\n"
 msgstr ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " #include <gnome-full>\n"
 " #endif\n"
 
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index 49fc014..ddc29b1 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -450,13 +450,7 @@ msgstr "Editar #{auto/config}# del siguiente modo:"
 
 #. type: Plain text
 #: en/user_examples.ssi:101
-#, fuzzy, no-wrap
-#| msgid ""
-#| " lb config noauto \\\n"
-#| "     --architecture i386 \\\n"
-#| "     --linux-flavours 686-pae \\\n"
-#| "     --package-lists lxde \\\n"
-#| "     \"${@}\"\n"
+#, no-wrap
 msgid ""
 " lb config noauto \\\n"
 "     --architectures i386 \\\n"
@@ -465,7 +459,7 @@ msgid ""
 "     \"${@}\"\n"
 msgstr ""
 " lb config noauto \\\n"
-"     --architecture i386 \\\n"
+"     --architectures i386 \\\n"
 "     --linux-flavours 686-pae \\\n"
 "     --package-lists lxde \\\n"
 "     \"${@}\"\n"
@@ -483,14 +477,6 @@ msgstr " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
 
 #. type: Plain text
 #: en/user_examples.ssi:113
-#, fuzzy
-#| msgid ""
-#| "First, #{--architecture i386}# ensures that on our #{amd64}# build "
-#| "system, we build a 32-bit version suitable for use on most machines. "
-#| "Second, we use #{--linux-flavours 686-pae}# because we don't anticipate "
-#| "using this image on much older systems. Third, we've chosen the #{lxde}# "
-#| "package list to give us a minimal desktop. And finally, we have added two "
-#| "initial favourite packages: #{iceweasel}# and #{xchat}#."
 msgid ""
 "First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
@@ -499,7 +485,7 @@ msgid ""
 "a minimal desktop. And finally, we have added two initial favourite "
 "packages: #{iceweasel}# and #{xchat}#."
 msgstr ""
-"En primer lugar con #{--architecture i386}# se asegura de que en nuestro "
+"En primer lugar con #{--architectures i386}# se asegura de que en nuestro "
 "sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para "
 "ser usada en la mayoría de máquinas. En segundo lugar, se usa #{--linux-"
 "flavours 686-pae}# porque no se espera usar esta imagen en sistemas mucho "
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index d6be390..d835bb1 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -660,14 +660,6 @@ msgstr "3~ Utilisant des conditionnels dans les listes de paquets"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:136
-#, fuzzy
-#| msgid ""
-#| "Any of the live-build configuration variables stored in #{config/*}# "
-#| "(minus the #{LB_}# prefix) may be used in conditional statements in "
-#| "package lists. Generally, this means any #{lb config}# option uppercased "
-#| "and with dashes changed to underscores. But in practice, it is only the "
-#| "ones that influence package selection that make sense, such as #"
-#| "{DISTRIBUTION}#, #{ARCHITECTURE}# or #{ARCHIVE_AREAS}#."
 msgid ""
 "Any of the live-build configuration variables stored in #{config/*}# (minus "
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -682,20 +674,16 @@ msgstr ""
 "option #{lb config}# majuscule et avec tirets changées en caractères de "
 "soulignement. Mais en pratique, c'est seulement ceux qui influencent "
 "lasélection des paquets qui font sens, comme #{DISTRIBUTION}#, #"
-"{ARCHITECTURE}# ou #{ARCHIVE_AREAS}#."
+"{ARCHITECTURES}# ou #{ARCHIVE_AREAS}#."
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:138
-#, fuzzy
-#| msgid ""
-#| "For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
-#| "specified:"
 msgid ""
 "For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
 "specified:"
 msgstr ""
-"Par exemple, pour installer #{ia32-libs}# si la #{--architecture amd64}# est "
-"spécifié:"
+"Par exemple, pour installer #{ia32-libs}# si la #{--architectures amd64}# "
+"est spécifié:"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:144
@@ -708,18 +696,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:148
-#, fuzzy
-#| 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:"
 msgid ""
 "You may test for any one of a number of values, e.g. to install #{memtest86+}"
 "# if either #{--architectures i386}# or #{--architectures amd64}# is "
 "specified:"
 msgstr ""
 "Vous pouvez tester pour un certain nombre de valeurs, par exemple pour "
-"installer #{memtest86+}# si #{--architecture i386}# ou #{--architecture "
+"installer #{memtest86+}# si #{--architectures i386}# ou #{--architectures "
 "amd64}# est spécifié:"
 
 #. type: Plain text
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 4157915..e79ceb8 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -457,14 +457,6 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:113
-#, fuzzy
-#| msgid ""
-#| "First, #{--architecture i386}# ensures that on our #{amd64}# build "
-#| "system, we build a 32-bit version suitable for use on most machines. "
-#| "Second, we use #{--linux-flavours 686-pae}# because we don't anticipate "
-#| "using this image on much older systems. Third, we've chosen the #{lxde}# "
-#| "package list to give us a minimal desktop. And finally, we have added two "
-#| "initial favourite packages: #{iceweasel}# and #{xchat}#."
 msgid ""
 "First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
@@ -473,7 +465,7 @@ msgid ""
 "a minimal desktop. And finally, we have added two initial favourite "
 "packages: #{iceweasel}# and #{xchat}#."
 msgstr ""
-"Tout d'abord, #{--architecture i386}# assure que sur notre système de "
+"Tout d'abord, #{--architectures i386}# assure que sur notre système de "
 "construction #{amd64}#, nous construisons une version 32 bits qui peut être "
 "utilisé sur la plupart des machines. Deuxièmement, nous utilisons #{--linux-"
 "flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette image sur "

-- 
live-manual



More information about the debian-live-changes mailing list