[SCM] live-manual branch, debian-old-2.0, updated. 9cf8e0445fe42e48ae56927f2da3af2827930032
chals
chals at altorricon.com
Thu Mar 8 15:34:20 UTC 2012
The following commit has been merged in the debian-old-2.0 branch:
commit 9cf8e0445fe42e48ae56927f2da3af2827930032
Author: chals <chals at altorricon.com>
Date: Thu Mar 8 16:33:21 2012 +0100
Merging part of the 'Apt pinning' section from 3.x, regenerating po files and reducing the number of fuzzy strings from 23 to 6.
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 4bb3495..0e5eb27 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -2,10 +2,16 @@
1~about-manual About this manual
-The main goal of this manual is to serve as a single access point to all
-documentation related to the Debian Live project. It does not include
-end-user documentation for using a Debian Live system as far as things are
-live specific.
+This manual serves as a single access point to all documentation related to
+the Debian Live project and in particular applies to the software produced
+by the project for the Debian 6.0 "Squeeze" release. While it is primarily
+focused on helping you build a live system and not on end-user topics, an
+end-user may find some useful information in these sections: {The
+Basics}#the-basics covers preparing images to be booted from media or the
+network, and {Customizing run time
+behaviours}#customizing-run-time-behaviours describes some options that may
+be specified at the boot prompt, such as selecting a keyboard layout and
+locale, and using persistence.
Some of the commands mentioned in the text must be executed with superuser
privileges which can be obtained by becoming the root user via #{su}# or by
@@ -19,19 +25,21 @@ command.
While we believe that everything in this manual is important to at least
some of our users, we realize it is a lot of material to cover and that you
may wish to experience early success using the software before delving into
-the details. Therefore, we have provided three tutorials in the
-{Examples}#examples section designed to teach you image building and
-customization basics. Read {Using the examples}#using-the-examples first,
-followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
-image}#tutorial-3. By the end of these tutorials, you will have a taste of
-what can be done with Debian Live. We encourage you to return to more
-in-depth study of the manual, perhaps next reading {The basics}#the-basics,
-skimming or skipping {Building a netboot image}#building-netboot-image, and
-finishing by reading the {Customization overview}#customization-overview and
-the chapters that follow it. By this point, we hope you are thoroughly
-excited by what can be done with Debian Live and motivated to read the rest
-of the manual, cover-to-cover.
+the details. Therefore, we suggest reading in the following order. First,
+read this chapter, {About this manual}#about-manual, from the beginning and
+ending with the {Terms}#terms section. Next, skip to the three tutorials at
+the front of the {Examples}#examples section designed to teach you image
+building and customization basics. Read {Using the
+examples}#using-the-examples first, followed by {Tutorial 1: A standard
+image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and
+finally {Tutorial 3: A personalized image}#tutorial-3. By the end of these
+tutorials, you will have a taste of what can be done with Debian Live. We
+encourage you to return to more in-depth study of the manual, perhaps next
+reading {The basics}#the-basics, skimming or skipping {Building a netboot
+image}#building-netboot-image, and finishing by reading the {Customization
+overview}#customization-overview and the chapters that follow it. By this
+point, we hope you are thoroughly excited by what can be done with Debian
+Live and motivated to read the rest of the manual, cover-to-cover.
2~terms Terms
@@ -125,7 +133,7 @@ _* Richard Nelson
_* Trent W. Buck
-2~ Contributing to this document
+2~how-to-contribute Contributing to this document
This manual is intended as a community project and all proposals for
improvements and contributions are extremely welcome. The preferred way to
@@ -175,7 +183,7 @@ code{
}code
-3~ Applying patches
+3~ Applying changes
Anyone can directly commit to the repository. However, we ask you to send
bigger changes to the mailing list to discuss them first. To push to the
@@ -186,11 +194,11 @@ _* Fetch the public commit key:
code{
$ mkdir -p ~/.ssh/identity.d
- $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
- -O ~/.ssh/identity.d/gitosis at live.debian.net
- $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
- -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
- $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
+ $ wget http://live.debian.net/other/keys/git@live.debian.net \
+ -O ~/.ssh/identity.d/git at live.debian.net
+ $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \
+ -O ~/.ssh/identity.d/git at live.debian.net.pub
+ $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*
}code
@@ -201,8 +209,8 @@ code{
$ cat >> ~/.ssh/config << EOF
Host live.debian.net
Hostname live.debian.net
- User gitosis
- IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
+ User git
+ IdentityFile ~/.ssh/identity.d/git at live.debian.net
EOF
}code
@@ -211,9 +219,11 @@ _* Check out a clone of the manual through ssh:
code{
- $ git clone gitosis at live.debian.net:/live-manual.git
+ $ git clone git at live.debian.net:/live-manual.git
+ $ cd live-manual && git checkout debian-next
-}code
+}code _* Note that you should commit any changes on the debian-next branch,
+not on the debian branch.
_* After editing the files in #{manual/en/}#, please call the 'commit'
target in the top level directory to sanitize the files and update the
@@ -225,10 +235,18 @@ code{
}code
-_* After sanitizing, commit the changes. Write commit messages that consist
-of full, useful sentences in English, starting with a capital letter and
-ending with a full stop. Usually, these will start with the form
-'Fixing/Adding/Removing/Correcting/Translating', e.g.
+_* Then
+
+code{
+
+ $ git add .
+
+}code
+
+_* After sanitizing and adding the files, commit the changes. Write commit
+messages that consist of full, useful sentences in English, starting with a
+capital letter and ending with a full stop. Usually, these will start with
+the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
code{
@@ -244,7 +262,7 @@ code{
}code
-3~ Translation
+3~translation Translation
To submit a translation for a new language, follow these three steps:
@@ -258,5 +276,8 @@ _* Once the new language is added, you can randomly start translating all po
files in #{manual/po/}#.
_* Don't forget you need #{make commit}# to ensure the translated manuals
-are updated from the po files, before #{git commit -a}# and #{git push}#.
+are updated from the po files and then you can review your changes launching
+#{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
+and #{git push}#.
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 765f56a..c596018 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Project <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-01-25
+ :published: 2012-03-08
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index dddfe30..d799847 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -187,6 +187,8 @@ environments and some special purpose lists, as well as standard lists the
others are based upon. You can also provide your own package lists, or use a
combination of both.
+*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.
+
3~ Predefined package lists
The simplest way to use lists is to specify one or more predefined lists
@@ -541,19 +543,20 @@ and #{aptitude}# for details.
For background, please first read the #{apt_preferences(5)}# man page. APT
pinning can be configured either for build time, or else for run time. For
the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/apt/preferences}#.
+#{config/chroot_local-includes/etc/apt/preferences}#..
-Let's say you are building a Squeeze live system but need all #{live-*}#
-packages to be installed from Sid at build time. You need to add Sid to your
-APT sources and pin it so that only the packages you want are installed from
-it at build time and all others are taken from the target system
-distribution, Squeeze. The following will accomplish this:
+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
+time. You need to add Sid to your APT sources and pin it so that only the
+packages you want are installed from it at build time and all others are
+taken from the target system distribution, Squeeze. The following will
+accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
- Package: live-*
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << END
+ Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 08f82d1..b5822e0 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Project <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-01-25
+ :published: 2012-03-08
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 4645b2b..b7c6e15 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -104,6 +104,8 @@ If you need to specify a large number of packages to be installed or you need fl
Package lists are a powerful way of expressing which packages should be installed. The list syntax supports included files and conditional sections which makes it easy to build lists from other lists and adapt them for use in multiple configurations. You can use predefined package lists, providing in a modular fashion package selections from each of the major desktop environments and some special purpose lists, as well as standard lists the others are based upon. You can also provide your own package lists, or use a combination of both.
+*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.
+
3~ Predefined package lists
The simplest way to use lists is to specify one or more predefined lists with the #{--packages-lists}# option. For example:
@@ -323,15 +325,15 @@ If there is not an #{lb config}# option to alter APT's behaviour in the way you
3~apt-pinning APT pinning
-For background, please first read the #{apt_preferences(5)}# man page. APT pinning can be configured either for build time, or else for run time. For the former, create #{config/chroot_apt/preferences}#. For the latter, create #{config/chroot_local-includes/etc/apt/preferences}#.
+For background, please first read the #{apt_preferences(5)}# man page. APT pinning can be configured either for build time, or else for run time. For the former, create #{config/chroot_apt/preferences}#. For the latter, create #{config/chroot_local-includes/etc/apt/preferences}#..
-Let's say you are building a Squeeze live system but need all #{live-*}# packages to be installed from Sid at build time. You need to add Sid to your APT sources and pin it so that only the packages you want are installed from it at build time and all others are taken from the target system distribution, Squeeze. The following will accomplish this:
+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 time. You need to add Sid to your APT sources and pin it so that only the packages you want are installed from it at build time and all others are taken from the target system distribution, Squeeze. The following will accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
- Package: live-*
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << END
+ Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index 14dc091..96fc7b9 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -2,10 +2,17 @@
1~about-manual À propos de ce manuel
-Le but principal de ce manuel est de servir de point d'accès centralisé pour
-toute la documentation liée au projet Debian Live. Il ne contient pas de
-documentation utilisateur pour utiliser un système Debian Live tant que
-celle-ci n'est pas spécifique au projet Live.
+L'objectif principal de ce manuel est servir de point d'accès unique à tous
+les documents liés au projet Debian Live et particulièrement aux logiciels
+produits par le projet pour Debian 6.0 "Squeeze". Tandis qu'il est
+principalement sur vous aider à construire un système Live et non pas sur
+des sujets de l'utilisateur final, un utilisateur final peut trouver des
+informations utiles dans ces sections: {Les Bases}#the-basics couvrent la
+préparation des images pour être démarrées à partir des supports ou depuis
+le réseau, et {Personnalisation des comportements au moment de
+l'exécution}#customizing-run-time-behaviours décrit certaines options qui
+peuvent être spécifiées à l'invite de démarrage, tels que la sélection d'un
+clavier, des paramètres régionaux, et la utilisation de la persistance.
Certaines commandes mentionnées dans le texte doivent être exécutées avec
les privilèges super-utilisateur, qui peuvent être obtenu en devenant root à
@@ -15,24 +22,28 @@ nécessitant les privilèges super-utilisateur, les commandes sont précédées
respectivement par #{$}# ou #{#}#. Ce symbole ne fait pas partie de la
commande.
-2~ For the impatient
-
-While we believe that everything in this manual is important to at least
-some of our users, we realize it is a lot of material to cover and that you
-may wish to experience early success using the software before delving into
-the details. Therefore, we have provided three tutorials in the
-{Examples}#examples section designed to teach you image building and
-customization basics. Read {Using the examples}#using-the-examples first,
-followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
-image}#tutorial-3. By the end of these tutorials, you will have a taste of
-what can be done with Debian Live. We encourage you to return to more
-in-depth study of the manual, perhaps next reading {The basics}#the-basics,
-skimming or skipping {Building a netboot image}#building-netboot-image, and
-finishing by reading the {Customization overview}#customization-overview and
-the chapters that follow it. By this point, we hope you are thoroughly
-excited by what can be done with Debian Live and motivated to read the rest
-of the manual, cover-to-cover.
+2~ Pour les impatients
+
+Même si nous croyons que tout dans ce manuel est important pour au moins
+certains de nos utilisateurs, nous nous rendons compte qu'il y a beaucoup de
+matière à couvrir et que vous pouvez vouloir expérimenter avant d'entrer
+dans les détails. Par conséquent, nous vous suggérons de lire dans l'ordre
+suivant. Tout d'abord, lisez ce chapitre {À propos de ce
+manuel}#about-manual dès le début et finissant avec la section
+{Terminologie}#terms. Ensuite, sautez aux trois tutoriels à l'avant de la
+section {Exemples}#examples destinée à vous apprendre la construction de
+l'image et les bases de la personnalisation. Lire en premier {En utilisant
+les exemples}#using-the-examples, suivie par {Tutoriel 1: Une image
+standard}#tutorial-1, {Tutoriel 2: Un logiciel de navigateur Web}#tutorial-2
+et finalement {Tutoriel 3: Une image personnalisée}#tutorial-3. À la fin de
+ces tutoriels, vous aurez un avant-goût de ce qui peut être fait avec Debian
+Live. Nous vous encourageons à revenir à l'étude plus approfondie du manuel,
+la prochaine lecture peut-être {Les bases}#the-basics, passer pour
+{Construire une image netboot}#building-netboot-image, et finissant par la
+lecture de la{Vue d'ensemble de la personnalisation}#customization-overview
+et les autres sections suivantes. En ce point, nous espérons que vous êtes
+complètement excités par ce que on peut faire avec Debian Live et motivés
+pour lire le reste du manuel, du début à la fin.
2~terms Terminologie
@@ -87,12 +98,12 @@ _* *{Distribution de destination}*: La distribution sur laquelle votre
système live sera basée. Ceci peut varier en fonction de la distribution de
votre système hôte.
-_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian codenames for
-releases. At the time of writing, Squeeze is the current *{stable}* release
-and Wheezy is the current *{testing}* release. Sid will always be a synonym
-for the *{unstable}* release. Throughout the manual, we tend to use
-codenames for the releases, as that is what is supported by the tools
-themselves.
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian noms de code
+pour les versions. Au moment de la rédaction, Squeeze est le courant version
+*{stable}* et Wheezy est la version actuelle *{testing}*. Sid sera toujours
+synonyme de la version *{unstable}*. Tout au long du manuel, nous avons
+tendance à utiliser des noms de code pour les versions, car c'est ce qui est
+supporté par les outils eux-mêmes.
La distribution *{stable}* contient la dernière version officielle de
Debian. La distribution *{testing}* est la future version stable où seuls
@@ -130,7 +141,7 @@ _* Richard Nelson
_* Trent W. Buck
-2~ Contribuer à ce document
+2~how-to-contribute Contribuer à ce document
Ce manuel est conçu comme un projet communautaire et toutes les propositions
d'améliorations et de contributions sont les bienvenues. La meilleure façon
@@ -170,9 +181,9 @@ code{
}code
-Since it takes a while to build the manual in all supported languages, you
-may find it convenient when proofing to build for only one language, e.g. by
-executing:
+Comme il faut un certain temps pour construire le manuel dans toutes les
+langues disponibles, il peut être pratique construire pour une seule langue,
+par exemple en exécutant:
code{
@@ -180,7 +191,7 @@ code{
}code
-3~ Appliquer des patches
+3~ Appliquer des modifications
Les contributions directes au répertoire sont possibles pour tout le
monde. Cependant, nous vous demandons d'envoyer les changements conséquents
@@ -192,11 +203,11 @@ _* Téléchargez la clé publique:
code{
$ mkdir -p ~/.ssh/identity.d
- $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
- -O ~/.ssh/identity.d/gitosis at live.debian.net
- $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
- -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
- $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
+ $ wget http://live.debian.net/other/keys/git@live.debian.net \
+ -O ~/.ssh/identity.d/git at live.debian.net
+ $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \
+ -O ~/.ssh/identity.d/git at live.debian.net.pub
+ $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*
}code
@@ -207,8 +218,8 @@ code{
$ cat >> ~/.ssh/config << EOF
Host live.debian.net
Hostname live.debian.net
- User gitosis
- IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
+ User git
+ IdentityFile ~/.ssh/identity.d/git at live.debian.net
EOF
}code
@@ -217,11 +228,13 @@ _* Clonez le manuel via ssh:
code{
- $ git clone gitosis at live.debian.net:/live-manual.git
+ $ git clone git at live.debian.net:/live-manual.git
+ $ cd live-manual && git checkout debian-next
-}code
+}code _* Note that you should commit any changes on the debian-next branch,
+not on the debian branch.
-_* Après édition des fichiers dans manual/en/, veuillez appeler 'commit'
+_* Après édition des fichiers dans #{manual/en/}#, veuillez appeler 'commit'
dans le dossier racine du répertoire afin de de nettoyer les fichier et de
mettre à jour les fichiers de traduction:
@@ -231,10 +244,19 @@ code{
}code
-_* Après nettoyage, soumettre les modifications. Veuillez écrire les
-commentaires de commit à l'aide de phrases complètes, en commençant par une
-majuscule et en terminant par un point, et en commençant par
-'Fixing/Adding/Removing/Correcting/Translating':
+_* Alors
+
+code{
+
+ $ git add .
+
+}code
+
+_* Après le nettoyage et d'ajouter les fichiers, soumettre les
+modifications. Veuillez écrire les commentaires de commit à l'aide de
+phrases complètes, en commençant par une majuscule et en terminant par un
+point, et en commençant par 'Fixing/Adding/Removing/Correcting/Translating',
+par exemple
code{
@@ -250,19 +272,22 @@ code{
}code
-3~ Translation
+3~translation Traduction
To submit a translation for a new language, follow these three steps:
-_* Translate the about_manual.ssi.pot, about_project.ssi.pot and
-index.html.in.pot files to your language with your favourite editor (such as
-poedit). Send translated files to the mailing list. Once we have reviewed
-your submission, we will add the new language to the manual (providing the
-po files) and will enable it in the autobuild.
+_* Traduire les fichiers about_manual.ssi.pot, about_project.ssi.pot et
+index.html.in.pot à votre langue avec votre éditeur préféré (comme
+poedit). Envoyer les fichiers traduits à la liste de diffusion. Une fois que
+nous avons examiné votre livraison, nous allons ajouter une nouvelle langue
+au manuel (avec les fichiers po) et l'activer dans l'autobuild.
-_* Once the new language is added, you can randomly start translating all po
-files in #{manual/po/}#.
+_* Une fois la nouvelle langue est ajoutée, vous pouvez commencer à traduire
+de façon aléatoire tous les fichiers po dans #{manual/po/}#.
-_* Don't forget you need #{make commit}# to ensure the translated manuals
-are updated from the po files, before #{git commit -a}# and #{git push}#.
+_* N'oubliez pas que vous devez faire un #{make commit}# pour assurer que la
+traduction des manuels sont mis à jour à partir des fichiers po, alors vous
+pouvez réviser vos modifications avec #{make build}# avant #{git add .}#,
+#{git commit -a -m "Translating..."}# et #{git push}#.
+*{Remarque:}* S'il vous plaît soyez conscient que même si les deux #{make commit}# et #{make build}# suppriment votre répertoire de construction, si vous construisez le manuel pour examiner vos modifications comme il est recommandé, et vous voulez nettoyer votre arbre git avant de les envoyer, vous pouvez utiliser #{make clean}#. Cette dernière étape n'est pas obligatoire grâce au fichier .gitignore mais il est une bonne pratique pour éviter d'envoyer certains fichiers involontairement.
\ No newline at end of file
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 08f82d1..b5822e0 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Project <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-01-25
+ :published: 2012-03-08
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index dddfe30..d799847 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -187,6 +187,8 @@ environments and some special purpose lists, as well as standard lists the
others are based upon. You can also provide your own package lists, or use a
combination of both.
+*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.
+
3~ Predefined package lists
The simplest way to use lists is to specify one or more predefined lists
@@ -541,19 +543,20 @@ and #{aptitude}# for details.
For background, please first read the #{apt_preferences(5)}# man page. APT
pinning can be configured either for build time, or else for run time. For
the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/apt/preferences}#.
+#{config/chroot_local-includes/etc/apt/preferences}#..
-Let's say you are building a Squeeze live system but need all #{live-*}#
-packages to be installed from Sid at build time. You need to add Sid to your
-APT sources and pin it so that only the packages you want are installed from
-it at build time and all others are taken from the target system
-distribution, Squeeze. The following will accomplish this:
+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
+time. You need to add Sid to your APT sources and pin it so that only the
+packages you want are installed from it at build time and all others are
+taken from the target system distribution, Squeeze. The following will
+accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
- Package: live-*
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << END
+ Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
diff --git a/manual/it/about_manual.ssi b/manual/it/about_manual.ssi
index f8354cd..ffe15eb 100644
--- a/manual/it/about_manual.ssi
+++ b/manual/it/about_manual.ssi
@@ -2,10 +2,16 @@
1~about-manual A proposito di questo manuale
-L'obiettivo di questo manuale è quello di servire da punto di accesso
-centralizzato per tutta la documentazione relativa al progetto Debian Live;
-non include documentazione rivolta agli utenti finali sul come usare un
-sistema Debian Live, se non quella specifica per un sistema live.
+This manual serves as a single access point to all documentation related to
+the Debian Live project and in particular applies to the software produced
+by the project for the Debian 6.0 "Squeeze" release. While it is primarily
+focused on helping you build a live system and not on end-user topics, an
+end-user may find some useful information in these sections: {The
+Basics}#the-basics covers preparing images to be booted from media or the
+network, and {Customizing run time
+behaviours}#customizing-run-time-behaviours describes some options that may
+be specified at the boot prompt, such as selecting a keyboard layout and
+locale, and using persistence.
Alcuni dei comandi menzionati nel testo devono essere eseguiti con i
privilegi di super-utente che possono essere ottenuti diventando utente root
@@ -16,24 +22,24 @@ di super-utente, i comandi sono preceduti rispettivamente da #{$}# o
2~ Per gli impazienti
-Sebbene crediamo che ogni cosa in questo manuale sia importante almeno per
-alcuni dei nostri utenti, ci rendiamo conto che c'è tanto materiale da
-trattare e che si potrebbe voler provare il software prima di entrare nei
-dettagli. Pertanto, abbiamo messo a disposizione nella sezione
-{Esempi}#examples tre tutorial progettati per insegnarvi le basi della
-costruzione e della personalizzazione delle immagini. Si legga innanzitutto
-{Usare gli esempi}#using-the-examples, seguito da {Tutorial 1: un'immagine
-standard}#tutorial-1, {Tutorial 2: un programma di utilità web
-browser}#tutorial-2 e, infine, {Tutorial 3: un'immagine
-personalizzata}#tutorial-3. Alla fine di queste esercitazioni, si avrà un
-assaggio di ciò che si può fare con Debian Live. Ti invitiamo ad uno studio
-più approfondito del manuale, magari leggendo in seguito {Nozioni di
-base}#the-basics, sfogliando o saltando {Creare un'immagine
-netboot}#building-netboot-image, e finendo con la lettura di {Panoramica
-sulla personalizzazione}#customization-overview e dei capitoli che lo
-seguono. A questo punto, ci auguriamo che tu sia davvero eccitato da ciò che
-si può fare con Debian Live e motivato a leggere il resto del manuale, da
-cima a fondo.
+While we believe that everything in this manual is important to at least
+some of our users, we realize it is a lot of material to cover and that you
+may wish to experience early success using the software before delving into
+the details. Therefore, we suggest reading in the following order. First,
+read this chapter, {About this manual}#about-manual, from the beginning and
+ending with the {Terms}#terms section. Next, skip to the three tutorials at
+the front of the {Examples}#examples section designed to teach you image
+building and customization basics. Read {Using the
+examples}#using-the-examples first, followed by {Tutorial 1: A standard
+image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and
+finally {Tutorial 3: A personalized image}#tutorial-3. By the end of these
+tutorials, you will have a taste of what can be done with Debian Live. We
+encourage you to return to more in-depth study of the manual, perhaps next
+reading {The basics}#the-basics, skimming or skipping {Building a netboot
+image}#building-netboot-image, and finishing by reading the {Customization
+overview}#customization-overview and the chapters that follow it. By this
+point, we hope you are thoroughly excited by what can be done with Debian
+Live and motivated to read the rest of the manual, cover-to-cover.
2~terms Glossario
@@ -128,7 +134,7 @@ _* Richard Nelson
_* Trent W. Buck
-2~ Contribuire a questo documento
+2~how-to-contribute Contribuire a questo documento
Questo manuale è pensato come un progetto comunitario e ogni suggerimento e
contributo è benvenuto. Il modo migliore per apportare un contributo è di
@@ -178,7 +184,7 @@ code{
}code
-3~ Applicare le patch
+3~ Applicare le modifiche
Chiunque può eseguire il commit direttamente sul repository; tuttavia
chiediamo di inviare le modifiche più corpose in mailing list, per poterne
@@ -190,11 +196,11 @@ _* Prelevare la chiave pubblica:
code{
$ mkdir -p ~/.ssh/identity.d
- $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
- -O ~/.ssh/identity.d/gitosis at live.debian.net
- $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
- -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
- $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
+ $ wget http://live.debian.net/other/keys/git@live.debian.net \
+ -O ~/.ssh/identity.d/git at live.debian.net
+ $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \
+ -O ~/.ssh/identity.d/git at live.debian.net.pub
+ $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*
}code
@@ -206,8 +212,8 @@ code{
$ cat >> ~/.ssh/config << EOF
Host live.debian.net
Hostname live.debian.net
- User gitosis
- IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
+ User git
+ IdentityFile ~/.ssh/identity.d/git at live.debian.net
EOF
}code
@@ -216,9 +222,11 @@ _* Scaricare tramite ssh un clone del manuale:
code{
- $ git clone gitosis at live.debian.net:/live-manual.git
+ $ git clone git at live.debian.net:/live-manual.git
+ $ cd live-manual && git checkout debian-next
-}code
+}code _* Note that you should commit any changes on the debian-next branch,
+not on the debian branch.
_* Dopo aver modificato i file in #{manual/en/}#, chiamare il target
'commit' nella directory superiore per bonificare i file ed aggiornare i
@@ -230,11 +238,19 @@ code{
}code
-_* Dopo la pulizia è possibile eseguire il commit delle modifiche. Si
-scrivano messaggi costituiti da frasi in inglese esaurienti ed utili,
-inizianti con una lettera maiuscola e terminanti con un punto. Solitamente
-cominceranno con la forma 'Fixing/Adding/Removing/Correcting/Translating',
-ad esempio.
+_* Then
+
+code{
+
+ $ git add .
+
+}code
+
+_* Dopo aver pulito e aggiunto i file è possibile eseguire il commit delle
+modifiche. Si scrivano messaggi costituiti da frasi in inglese esaurienti e
+utili, inizianti con una lettera maiuscola e terminanti con un
+punto. Solitamente cominceranno con la forma
+"Fixing/Adding/Removing/Correcting/Translating", ad esempio.
code{
@@ -250,7 +266,7 @@ code{
}code
-3~ Traduzione
+3~translation Traduzione
Per inviare una traduzione per una nuova lingua, seguire questi tre passi:
@@ -264,7 +280,9 @@ _* Una volta che la nuova lingua è stata aggiunta, si può iniziare a
tradurre tutti i file po situati in #{manual/po/}#, nell'ordine che si
preferisce.
-_* Non si dimentichi che è necessario dare un #{make commit}# per
-assicurarsi che i manuali tradotti siano aggiornati partendo dai file po,
-prima di #{git commit -a}# e #{git push}#.
+_* Non dimenticare che è necessario usare #{make commit}# per assicurarsi
+che i manuali tradotti siano aggiornati partendo dai file po, quindi si
+possono verificare le modifiche con #{make build}# prima di #{git add .}#,
+#{git commit -a -m "Traduzione..." }#e #{git push}#.
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 9c1e31f..c610beb 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Project <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Sui sistemi Debian, il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2011-01-25
+ :published: 2012-03-08
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index 321405a..31bbf4b 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -198,6 +198,7 @@ principali ambienti desktop e alcuni elenchi per uso speciale, così come
elenchi standard sui quali vi si basano altri. È inoltre possibile fornire i
propri elenchi o usare una combinazione di entrambi.
+*{Nota:}*Quando si specifica un pacchetto che non esiste, il comportamento di live-build è determinato dalla scelta delle utilità di APT. Per ulteriori dettagli si veda {Scegliere apt o aptitude}#choosing-apt-or-aptitude.
3~ Elenchi predefiniti di pacchetti
Il modo più semplice per usare gli elenchi è di specificarne uno o più con
@@ -558,17 +559,18 @@ può essere configurato sia in fase di costruzione sia di esecuzione; per la
prima creare #{config/chroot_apt/preferences}#, per quest'ultima creare
#{config/chroot_local-includes/etc/apt/preferences}#.
-Nell'ipotesi di creare un sistema live Squeeze e avendo la necessità di
-installare tutti i pacchetti #{live-*}# da Sid in questa fase, bisogna
-aggiungere Sid alle fonti di APT e farne il pinning affinché verranno
-installati da lì solo i pacchetti voluti e per tutti gli altri attingerà
-dalla distribuzione principale, Squeeze. Quanto segue servirà allo scopo:
+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
+time. You need to add Sid to your APT sources and pin it so that only the
+packages you want are installed from it at build time and all others are
+taken from the target system distribution, Squeeze. The following will
+accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
- Package: live-*
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << END
+ Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index c29186e..a788364 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-20 16:58-0400\n"
+"POT-Creation-Date: 2012-03-08 15:25+0100\n"
"PO-Revision-Date: 2010-10-22 08:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,10 +29,15 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. It does not include end-"
-"user documentation for using a Debian Live system as far as things are live "
-"specific."
+"This manual serves as a single access point to all documentation related to "
+"the Debian Live project and in particular applies to the software produced "
+"by the project for the Debian 6.0 \"Squeeze\" release. While it is primarily "
+"focused on helping you build a live system and not on end-user topics, an "
+"end-user may find some useful information in these sections: {The Basics}"
+"#the-basics covers preparing images to be booted from media or the network, "
+"and {Customizing run time behaviours}#customizing-run-time-behaviours "
+"describes some options that may be specified at the boot prompt, such as "
+"selecting a keyboard layout and locale, and using persistence."
msgstr ""
#. type: Plain text
@@ -57,19 +62,21 @@ msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
msgstr ""
#. type: Plain text
@@ -273,7 +280,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:76
-msgid "2~ Contributing to this document"
+msgid "2~how-to-contribute Contributing to this document"
msgstr ""
#. type: Plain text
@@ -304,8 +311,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:156 en/about_manual.ssi:164
+#: en/about_manual.ssi:172 en/about_manual.ssi:180 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -327,20 +334,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
@@ -373,8 +380,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:160 en/about_manual.ssi:168 en/about_manual.ssi:176
+#: en/about_manual.ssi:184 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -396,20 +403,20 @@ msgstr ""
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
@@ -477,7 +484,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
+msgid "3~ Applying changes"
msgstr ""
#. type: Plain text
@@ -498,11 +505,11 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
-" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-" -O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-" -O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-" $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
msgstr ""
#. type: Plain text
@@ -517,8 +524,8 @@ msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
" Host live.debian.net\n"
" Hostname live.debian.net\n"
-" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" User git\n"
+" IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
" EOF\n"
msgstr ""
@@ -528,63 +535,83 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone git at live.debian.net:/live-manual.git\n"
+" $ cd live-manual && git checkout debian-next\n"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:152
msgid ""
+"}code _* Note that you should commit any changes on the debian-next branch, "
+"not on the debian branch."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:154
+msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
"translation files:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:158
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:162
+msgid "_* Then"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:166
+#, no-wrap
+msgid " $ git add .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:170
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:174
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:178
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:172
+#: en/about_manual.ssi:182
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:176
-msgid "3~ Translation"
+#: en/about_manual.ssi:186
+msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:188
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:180
+#: en/about_manual.ssi:190
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -594,15 +621,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:192
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:184
+#: en/about_manual.ssi:194
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:195
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr ""
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 0612dc2..e4da8e0 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-25 07:12+0100\n"
+"POT-Creation-Date: 2012-03-08 15:25+0100\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -36,7 +36,7 @@ msgstr ""
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-01-25\n"
+" :published: 2012-03-08\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 7f881d1..fa1db3a 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 2.0.0\n"
-"POT-Creation-Date: 2011-01-03 16:01+0100\n"
+"POT-Creation-Date: 2012-03-08 15:59+0100\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,8 +19,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:156 en/about_manual.ssi:164
+#: en/about_manual.ssi:172 en/about_manual.ssi:180 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -42,20 +42,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
@@ -83,8 +83,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:160 en/about_manual.ssi:168 en/about_manual.ssi:176
+#: en/about_manual.ssi:184 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -106,20 +106,20 @@ msgstr ""
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
@@ -450,24 +450,30 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:108
-msgid "3~ Predefined package lists"
+#, no-wrap
+msgid "*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:110
+msgid "3~ Predefined package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:112
msgid ""
"The simplest way to use lists is to specify one or more predefined lists "
"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:116
#, no-wrap
msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:120
msgid ""
"In addition to these lists, live-build supports four virtual package lists: #"
"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
@@ -477,7 +483,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:122
msgid ""
"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
"at http://live.debian.net are built using the corresponding virtual #{*-"
@@ -485,7 +491,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:124
msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/lists/}#. To determine the packages in a given list, read the "
@@ -494,19 +500,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:128
msgid ""
"You may supplement or replace entirely the supplied lists using local "
"package lists stored in #{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed. Local package lists always override package lists "
@@ -515,12 +521,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:132
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:134
msgid ""
"In case you want to include some required .deb packages to live media's #"
"{pool/}# (without installing them onto the live image) you may need to use "
@@ -530,19 +536,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:136
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:138
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:140
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
@@ -550,7 +556,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:142
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
@@ -558,7 +564,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -566,12 +572,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -582,14 +588,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -598,14 +604,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:165
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:169
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -614,7 +620,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:175
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 "
@@ -622,7 +628,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -631,12 +637,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -645,17 +651,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:197
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:199
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 "
@@ -666,13 +672,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:203
#, no-wrap
msgid " $ lb config --tasks \"mail-server file-server\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:207
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, "
@@ -681,12 +687,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:209
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:211
msgid ""
"Desktop and language tasks are special cases. In the Debian Installer, if "
"the medium was prepared for a particular desktop environment flavour, the "
@@ -698,14 +704,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:213
msgid ""
"In live-build, therefore, these special cases are also given special "
"consideration, but with three notable differences at the time of writing."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:215
msgid ""
"First, there is no provision made yet automatically for language tasks, "
"although a subset of those packages are included if you specify #{lb config "
@@ -715,13 +721,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:219
#, no-wrap
msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:223
msgid ""
"Second, live-build supports #{*-desktop}# virtual package lists for each of "
"the desktop flavours mentioned above, which select the #{standard-x11}# "
@@ -733,7 +739,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:225
msgid ""
"Third, if any of the tasks for these desktop flavours are selected, either "
"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-"
@@ -743,19 +749,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:227
#, no-wrap
msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:231
#, no-wrap
msgid " $ lb config --language es\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:235
msgid ""
"Even so, it is limited in that it only supports a single language and a "
"single bootloader. Therefore, for all of these reasons, the future of this "
@@ -764,14 +770,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:237
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:239
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 "
@@ -782,7 +788,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:241
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -793,22 +799,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:243
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:245
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:247
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:249
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 "
@@ -816,12 +822,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:251
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:253
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -830,45 +836,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:255
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:255
+#: en/user_customization-packages.ssi:257
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:259
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:261
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:263
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:265
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:267
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -876,7 +882,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:269
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 "
@@ -884,12 +890,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:271
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:273
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 "
@@ -899,7 +905,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:275
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 "
@@ -909,12 +915,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:277
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:279
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 "
@@ -925,12 +931,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:281
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:283
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 "
@@ -940,26 +946,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:285
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:285
+#: en/user_customization-packages.ssi:287
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:287
+#: en/user_customization-packages.ssi:289
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:291
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}# "
@@ -967,18 +973,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:295
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:299
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:301
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 "
@@ -986,20 +992,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:303
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:305
+#: en/user_customization-packages.ssi:307
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:311
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 "
@@ -1009,20 +1015,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:313
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:315
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:321
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 "
@@ -1038,12 +1044,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:323
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:325
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 "
@@ -1052,42 +1058,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:327
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:329
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 "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/chroot_local-includes/etc/apt/preferences}#.."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:331
msgid ""
-"Let's say you are building a Squeeze live system but need all #{live-*}# "
-"packages to be installed from Sid at build time. You need to add Sid to your "
-"APT sources and pin it so that only the packages you want are installed from "
-"it at build time and all others are taken from the target system "
-"distribution, Squeeze. The following will accomplish this:"
+"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 "
+"time. You need to add Sid to your APT sources and pin it so that only the "
+"packages you want are installed from it at build time and all others are "
+"taken from the target system distribution, Squeeze. The following will "
+"accomplish this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:339
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
-" Package: live-*\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << END\n"
+" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:344
#, no-wrap
msgid ""
" Package: *\n"
@@ -1097,7 +1104,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:348
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 "
@@ -1108,7 +1115,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:352
+#: en/user_customization-packages.ssi:354
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index b51a04c..6f87bc9 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -2,19 +2,20 @@
# 2010 Christophe Siraut <chris at tobald.eu.org>
# This file is distributed under the same license as the live-config package.
# Creak <romain.failliot at foolstep.com>, 2010.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-20 16:58-0400\n"
-"PO-Revision-Date: 2010-10-27 23:14+0200\n"
-"Last-Translator: Creak <romain.failliot at foolstep.com>\n"
-"Language-Team: Français <debian-live at lists.debian.org>\n"
+"POT-Creation-Date: 2012-03-08 15:25+0100\n"
+"PO-Revision-Date: 2012-03-08 16:22+0100\n"
+"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
#: en/about_manual.ssi:2
@@ -29,15 +30,27 @@ msgstr "1~about-manual À propos de ce manuel"
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. It does not include end-"
-"user documentation for using a Debian Live system as far as things are live "
-"specific."
-msgstr ""
-"Le but principal de ce manuel est de servir de point d'accès centralisé pour "
-"toute la documentation liée au projet Debian Live. Il ne contient pas de "
-"documentation utilisateur pour utiliser un système Debian Live tant que "
-"celle-ci n'est pas spécifique au projet Live."
+"This manual serves as a single access point to all documentation related to "
+"the Debian Live project and in particular applies to the software produced "
+"by the project for the Debian 6.0 \"Squeeze\" release. While it is primarily "
+"focused on helping you build a live system and not on end-user topics, an "
+"end-user may find some useful information in these sections: {The Basics}"
+"#the-basics covers preparing images to be booted from media or the network, "
+"and {Customizing run time behaviours}#customizing-run-time-behaviours "
+"describes some options that may be specified at the boot prompt, such as "
+"selecting a keyboard layout and locale, and using persistence."
+msgstr ""
+"L'objectif principal de ce manuel est servir de point d'accès unique à tous "
+"les documents liés au projet Debian Live et particulièrement aux logiciels "
+"produits par le projet pour Debian 6.0 \"Squeeze\". Tandis qu'il est "
+"principalement sur vous aider à construire un système Live et non pas sur "
+"des sujets de l'utilisateur final, un utilisateur final peut trouver des "
+"informations utiles dans ces sections: {Les Bases}#the-basics couvrent la "
+"préparation des images pour être démarrées à partir des supports ou depuis "
+"le réseau, et {Personnalisation des comportements au moment de l'exécution}"
+"#customizing-run-time-behaviours décrit certaines options qui peuvent être "
+"spécifiées à l'invite de démarrage, tels que la sélection d'un clavier, des "
+"paramètres régionaux, et la utilisation de la persistance."
#. type: Plain text
#: en/about_manual.ssi:8
@@ -60,7 +73,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
msgid "2~ For the impatient"
-msgstr ""
+msgstr "2~ Pour les impatients"
#. type: Plain text
#: en/about_manual.ssi:12
@@ -68,20 +81,42 @@ msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
-msgstr ""
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
+msgstr ""
+"Même si nous croyons que tout dans ce manuel est important pour au moins "
+"certains de nos utilisateurs, nous nous rendons compte qu'il y a beaucoup de "
+"matière à couvrir et que vous pouvez vouloir expérimenter avant d'entrer "
+"dans les détails. Par conséquent, nous vous suggérons de lire dans l'ordre "
+"suivant. Tout d'abord, lisez ce chapitre {À propos de ce manuel}#about-"
+"manual dès le début et finissant avec la section {Terminologie}#terms. "
+"Ensuite, sautez aux trois tutoriels à l'avant de la section {Exemples}"
+"#examples destinée à vous apprendre la construction de l'image et les bases "
+"de la personnalisation. Lire en premier {En utilisant les exemples}#using-"
+"the-examples, suivie par {Tutoriel 1: Une image standard}#tutorial-1, "
+"{Tutoriel 2: Un logiciel de navigateur Web}#tutorial-2 et finalement "
+"{Tutoriel 3: Une image personnalisée}#tutorial-3. À la fin de ces tutoriels, "
+"vous aurez un avant-goût de ce qui peut être fait avec Debian Live. Nous "
+"vous encourageons à revenir à l'étude plus approfondie du manuel, la "
+"prochaine lecture peut-être {Les bases}#the-basics, passer pour {Construire "
+"une image netboot}#building-netboot-image, et finissant par la lecture de la"
+"{Vue d'ensemble de la personnalisation}#customization-overview et les autres "
+"sections suivantes. En ce point, nous espérons que vous êtes complètement "
+"excités par ce que on peut faire avec Debian Live et motivés pour lire le "
+"reste du manuel, du début à la fin."
#. type: Plain text
#: en/about_manual.ssi:14
@@ -236,6 +271,12 @@ msgid ""
"codenames for the releases, as that is what is supported by the tools "
"themselves."
msgstr ""
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: Debian noms de code "
+"pour les versions. Au moment de la rédaction, Squeeze est le courant version "
+"*{stable}* et Wheezy est la version actuelle *{testing}*. Sid sera toujours "
+"synonyme de la version *{unstable}*. Tout au long du manuel, nous avons "
+"tendance à utiliser des noms de code pour les versions, car c'est ce qui est "
+"supporté par les outils eux-mêmes. "
#. type: Plain text
#: en/about_manual.ssi:46
@@ -328,8 +369,8 @@ msgstr "_* Trent W. Buck"
#. type: Plain text
#: en/about_manual.ssi:76
-msgid "2~ Contributing to this document"
-msgstr "2~ Contribuer à ce document"
+msgid "2~how-to-contribute Contributing to this document"
+msgstr "2~how-to-contribute Contribuer à ce document"
#. type: Plain text
#: en/about_manual.ssi:78
@@ -369,8 +410,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:156 en/about_manual.ssi:164
+#: en/about_manual.ssi:172 en/about_manual.ssi:180 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -392,20 +433,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
@@ -438,8 +479,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:160 en/about_manual.ssi:168 en/about_manual.ssi:176
+#: en/about_manual.ssi:184 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -461,20 +502,20 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
@@ -538,6 +579,9 @@ msgid ""
"may find it convenient when proofing to build for only one language, e.g. by "
"executing:"
msgstr ""
+"Comme il faut un certain temps pour construire le manuel dans toutes les "
+"langues disponibles, il peut être pratique construire pour une seule langue, "
+"par exemple en exécutant:"
#. type: Plain text
#: en/about_manual.ssi:110
@@ -547,8 +591,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
-msgstr "3~ Appliquer des patches"
+msgid "3~ Applying changes"
+msgstr "3~ Appliquer des modifications"
#. type: Plain text
#: en/about_manual.ssi:116
@@ -572,11 +616,11 @@ msgstr "_* Téléchargez la clé publique:"
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
-" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-" -O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-" -O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-" $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
msgstr ""
#. type: Plain text
@@ -591,8 +635,8 @@ msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
" Host live.debian.net\n"
" Hostname live.debian.net\n"
-" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" User git\n"
+" IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
" EOF\n"
msgstr ""
@@ -602,70 +646,91 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Clonez le manuel via ssh:"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone git at live.debian.net:/live-manual.git\n"
+" $ cd live-manual && git checkout debian-next\n"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:152
msgid ""
+"}code _* Note that you should commit any changes on the debian-next branch, "
+"not on the debian branch."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:154
+msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
"translation files:"
msgstr ""
-"_* Après édition des fichiers dans manual/en/, veuillez appeler 'commit' "
+"_* Après édition des fichiers dans #{manual/en/}#, veuillez appeler 'commit' "
"dans le dossier racine du répertoire afin de de nettoyer les fichier et de "
"mettre à jour les fichiers de traduction:"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:158
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:162
+msgid "_* Then"
+msgstr "_* Alors"
+
+#. type: Plain text
+#: en/about_manual.ssi:166
+#, no-wrap
+msgid " $ git add .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:170
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
-"_* Après nettoyage, soumettre les modifications. Veuillez écrire les "
-"commentaires de commit à l'aide de phrases complètes, en commençant par une "
-"majuscule et en terminant par un point, et en commençant par 'Fixing/Adding/"
-"Removing/Correcting/Translating':"
+"_* Après le nettoyage et d'ajouter les fichiers, soumettre les "
+"modifications. Veuillez écrire les commentaires de commit à l'aide de "
+"phrases complètes, en commençant par une majuscule et en terminant par un "
+"point, et en commençant par 'Fixing/Adding/Removing/Correcting/Translating', "
+"par exemple "
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:174
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:178
msgid "_* Push the commit to the server:"
msgstr "_* Envoyez votre commit au serveur:"
#. type: Plain text
-#: en/about_manual.ssi:172
+#: en/about_manual.ssi:182
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:176
-msgid "3~ Translation"
-msgstr ""
+#: en/about_manual.ssi:186
+msgid "3~translation Translation"
+msgstr "3~translation Traduction"
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:188
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:180
+#: en/about_manual.ssi:190
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -673,17 +738,36 @@ msgid ""
"submission, we will add the new language to the manual (providing the po "
"files) and will enable it in the autobuild."
msgstr ""
+"_* Traduire les fichiers about_manual.ssi.pot, about_project.ssi.pot et "
+"index.html.in.pot à votre langue avec votre éditeur préféré (comme poedit). "
+"Envoyer les fichiers traduits à la liste de diffusion. Une fois que nous "
+"avons examiné votre livraison, nous allons ajouter une nouvelle langue au "
+"manuel (avec les fichiers po) et l'activer dans l'autobuild."
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:192
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
+"_* Une fois la nouvelle langue est ajoutée, vous pouvez commencer à traduire "
+"de façon aléatoire tous les fichiers po dans #{manual/po/}#."
#. type: Plain text
-#: en/about_manual.ssi:184
+#: en/about_manual.ssi:194
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
msgstr ""
+"_* N'oubliez pas que vous devez faire un #{make commit}# pour assurer que la "
+"traduction des manuels sont mis à jour à partir des fichiers po, alors vous "
+"pouvez réviser vos modifications avec #{make build}# avant #{git add .}#, #"
+"{git commit -a -m \"Translating...\"}# et #{git push}#."
+
+#. type: Plain text
+#: en/about_manual.ssi:195
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
+msgstr "*{Remarque:}* S'il vous plaît soyez conscient que même si les deux #{make commit}# et #{make build}# suppriment votre répertoire de construction, si vous construisez le manuel pour examiner vos modifications comme il est recommandé, et vous voulez nettoyer votre arbre git avant de les envoyer, vous pouvez utiliser #{make clean}#. Cette dernière étape n'est pas obligatoire grâce au fichier .gitignore mais il est une bonne pratique pour éviter d'envoyer certains fichiers involontairement."
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index c222d8a..bc8de0e 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-25 07:12+0100\n"
+"POT-Creation-Date: 2012-03-08 15:25+0100\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -36,7 +36,7 @@ msgstr ""
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-01-25\n"
+" :published: 2012-03-08\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 108a1d7..3718a75 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-03 16:01+0100\n"
+"POT-Creation-Date: 2012-03-08 15:59+0100\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,8 +19,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:156 en/about_manual.ssi:164
+#: en/about_manual.ssi:172 en/about_manual.ssi:180 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -42,20 +42,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
@@ -83,8 +83,8 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:160 en/about_manual.ssi:168 en/about_manual.ssi:176
+#: en/about_manual.ssi:184 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -106,20 +106,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
@@ -450,24 +450,30 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:108
-msgid "3~ Predefined package lists"
+#, no-wrap
+msgid "*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:110
+msgid "3~ Predefined package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:112
msgid ""
"The simplest way to use lists is to specify one or more predefined lists "
"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:116
#, no-wrap
msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:120
msgid ""
"In addition to these lists, live-build supports four virtual package lists: #"
"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
@@ -477,7 +483,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:122
msgid ""
"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
"at http://live.debian.net are built using the corresponding virtual #{*-"
@@ -485,7 +491,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:124
msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/lists/}#. To determine the packages in a given list, read the "
@@ -494,19 +500,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:128
msgid ""
"You may supplement or replace entirely the supplied lists using local "
"package lists stored in #{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed. Local package lists always override package lists "
@@ -515,12 +521,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:132
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:134
msgid ""
"In case you want to include some required .deb packages to live media's #"
"{pool/}# (without installing them onto the live image) you may need to use "
@@ -530,19 +536,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:136
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:138
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:140
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
@@ -550,7 +556,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:142
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
@@ -558,7 +564,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -566,12 +572,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -582,14 +588,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -598,14 +604,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:165
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:169
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -614,7 +620,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:175
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 "
@@ -622,7 +628,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -631,12 +637,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -645,17 +651,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:197
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:199
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 "
@@ -666,13 +672,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:203
#, no-wrap
msgid " $ lb config --tasks \"mail-server file-server\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:207
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, "
@@ -681,12 +687,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:209
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:211
msgid ""
"Desktop and language tasks are special cases. In the Debian Installer, if "
"the medium was prepared for a particular desktop environment flavour, the "
@@ -698,14 +704,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:213
msgid ""
"In live-build, therefore, these special cases are also given special "
"consideration, but with three notable differences at the time of writing."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:215
msgid ""
"First, there is no provision made yet automatically for language tasks, "
"although a subset of those packages are included if you specify #{lb config "
@@ -715,13 +721,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:219
#, no-wrap
msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:223
msgid ""
"Second, live-build supports #{*-desktop}# virtual package lists for each of "
"the desktop flavours mentioned above, which select the #{standard-x11}# "
@@ -733,7 +739,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:225
msgid ""
"Third, if any of the tasks for these desktop flavours are selected, either "
"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-"
@@ -743,19 +749,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:227
#, no-wrap
msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:231
#, no-wrap
msgid " $ lb config --language es\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:235
msgid ""
"Even so, it is limited in that it only supports a single language and a "
"single bootloader. Therefore, for all of these reasons, the future of this "
@@ -764,14 +770,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:237
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:239
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 "
@@ -782,7 +788,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:241
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -793,22 +799,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:243
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:245
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:247
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:249
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 "
@@ -816,12 +822,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:251
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:253
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -830,45 +836,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:255
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:255
+#: en/user_customization-packages.ssi:257
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:259
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:261
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:263
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:265
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:267
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -876,7 +882,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:269
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 "
@@ -884,12 +890,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:271
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:273
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 "
@@ -899,7 +905,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:275
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 "
@@ -909,12 +915,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:277
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:279
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 "
@@ -925,12 +931,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:281
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:283
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 "
@@ -940,26 +946,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:285
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:285
+#: en/user_customization-packages.ssi:287
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:287
+#: en/user_customization-packages.ssi:289
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:291
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}# "
@@ -967,18 +973,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:295
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:299
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:301
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 "
@@ -986,20 +992,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:303
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:305
+#: en/user_customization-packages.ssi:307
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:311
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 "
@@ -1009,20 +1015,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:313
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:315
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:321
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 "
@@ -1038,12 +1044,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:323
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:325
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 "
@@ -1052,42 +1058,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:327
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:329
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 "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/chroot_local-includes/etc/apt/preferences}#.."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:331
msgid ""
-"Let's say you are building a Squeeze live system but need all #{live-*}# "
-"packages to be installed from Sid at build time. You need to add Sid to your "
-"APT sources and pin it so that only the packages you want are installed from "
-"it at build time and all others are taken from the target system "
-"distribution, Squeeze. The following will accomplish this:"
+"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 "
+"time. You need to add Sid to your APT sources and pin it so that only the "
+"packages you want are installed from it at build time and all others are "
+"taken from the target system distribution, Squeeze. The following will "
+"accomplish this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:339
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
-" Package: live-*\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << END\n"
+" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:344
#, no-wrap
msgid ""
" Package: *\n"
@@ -1097,7 +1104,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:348
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 "
@@ -1108,7 +1115,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:352
+#: en/user_customization-packages.ssi:354
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/it/about_manual.ssi.po b/manual/po/it/about_manual.ssi.po
index 3dece7f..b191524 100644
--- a/manual/po/it/about_manual.ssi.po
+++ b/manual/po/it/about_manual.ssi.po
@@ -7,10 +7,10 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-20 16:58-0400\n"
-"PO-Revision-Date: 2010-12-11 02:34+0100\n"
-"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
-"Language-Team: Italian <tp at lists.linux.it>\n"
+"POT-Creation-Date: 2012-03-08 15:25+0100\n"
+"PO-Revision-Date: 2012-03-08 15:46+0100\n"
+"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,15 +30,16 @@ msgstr "1~about-manual A proposito di questo manuale"
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. It does not include end-"
-"user documentation for using a Debian Live system as far as things are live "
-"specific."
+"This manual serves as a single access point to all documentation related to "
+"the Debian Live project and in particular applies to the software produced "
+"by the project for the Debian 6.0 \"Squeeze\" release. While it is primarily "
+"focused on helping you build a live system and not on end-user topics, an "
+"end-user may find some useful information in these sections: {The Basics}"
+"#the-basics covers preparing images to be booted from media or the network, "
+"and {Customizing run time behaviours}#customizing-run-time-behaviours "
+"describes some options that may be specified at the boot prompt, such as "
+"selecting a keyboard layout and locale, and using persistence."
msgstr ""
-"L'obiettivo di questo manuale è quello di servire da punto di accesso "
-"centralizzato per tutta la documentazione relativa al progetto Debian Live; "
-"non include documentazione rivolta agli utenti finali sul come usare un "
-"sistema Debian Live, se non quella specifica per un sistema live."
#. type: Plain text
#: en/about_manual.ssi:8
@@ -64,23 +65,43 @@ msgstr "2~ Per gli impazienti"
#. type: Plain text
#: en/about_manual.ssi:12
+#, fuzzy
+#| msgid ""
+#| "While we believe that everything in this manual is important to at least "
+#| "some of our users, we realize it is a lot of material to cover and that "
+#| "you may wish to experience early success using the software before "
+#| "delving into the details. Therefore, we have provided three tutorials in "
+#| "the {Examples}#examples section designed to teach you image building and "
+#| "customization basics. Read {Using the examples}#using-the-examples first, "
+#| "followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web "
+#| "browser utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
+#| "#tutorial-3. By the end of these tutorials, you will have a taste of what "
+#| "can be done with Debian Live. We encourage you to return to more in-depth "
+#| "study of the manual, perhaps next reading {The basics}#the-basics, "
+#| "skimming or skipping {Building a netboot image}#building-netboot-image, "
+#| "and finishing by reading the {Customization overview}#customization-"
+#| "overview and the chapters that follow it. By this point, we hope you are "
+#| "thoroughly excited by what can be done with Debian Live and motivated to "
+#| "read the rest of the manual, cover-to-cover."
msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
msgstr ""
"Sebbene crediamo che ogni cosa in questo manuale sia importante almeno per "
"alcuni dei nostri utenti, ci rendiamo conto che c'è tanto materiale da "
@@ -345,8 +366,8 @@ msgstr "_* Trent W. Buck"
#. type: Plain text
#: en/about_manual.ssi:76
-msgid "2~ Contributing to this document"
-msgstr "2~ Contribuire a questo documento"
+msgid "2~how-to-contribute Contributing to this document"
+msgstr "2~how-to-contribute Contribuire a questo documento"
#. type: Plain text
#: en/about_manual.ssi:78
@@ -386,8 +407,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:156 en/about_manual.ssi:164
+#: en/about_manual.ssi:172 en/about_manual.ssi:180 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -409,20 +430,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
@@ -450,13 +471,13 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:86
msgid "$ git clone git://live.debian.net/git/live-manual.git"
-msgstr "$ git clone git://live.debian.net/git/live-manual.git"
+msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:160 en/about_manual.ssi:168 en/about_manual.ssi:176
+#: en/about_manual.ssi:184 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -478,20 +499,20 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
@@ -567,8 +588,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
-msgstr "3~ Applicare le patch"
+msgid "3~ Applying changes"
+msgstr "3~ Applicare le modifiche"
#. type: Plain text
#: en/about_manual.ssi:116
@@ -592,11 +613,11 @@ msgstr "_* Prelevare la chiave pubblica:"
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
-" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-" -O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-" -O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-" $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
msgstr ""
#. type: Plain text
@@ -613,8 +634,8 @@ msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
" Host live.debian.net\n"
" Hostname live.debian.net\n"
-" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" User git\n"
+" IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
" EOF\n"
msgstr ""
@@ -624,14 +645,23 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Scaricare tramite ssh un clone del manuale:"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone git at live.debian.net:/live-manual.git\n"
+" $ cd live-manual && git checkout debian-next\n"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:152
msgid ""
+"}code _* Note that you should commit any changes on the debian-next branch, "
+"not on the debian branch."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:154
+msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
"translation files:"
@@ -641,55 +671,66 @@ msgstr ""
"file di traduzione:"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:158
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:162
+msgid "_* Then"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:166
+#, no-wrap
+msgid " $ git add .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:170
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
-"_* Dopo la pulizia è possibile eseguire il commit delle modifiche. Si "
-"scrivano messaggi costituiti da frasi in inglese esaurienti ed utili, "
-"inizianti con una lettera maiuscola e terminanti con un punto. Solitamente "
-"cominceranno con la forma 'Fixing/Adding/Removing/Correcting/Translating', "
-"ad esempio."
+"_* Dopo aver pulito e aggiunto i file è possibile eseguire il commit delle "
+"modifiche. Si scrivano messaggi costituiti da frasi in inglese esaurienti e "
+"utili, inizianti con una lettera maiuscola e terminanti con un punto. "
+"Solitamente cominceranno con la forma \"Fixing/Adding/Removing/Correcting/"
+"Translating\", ad esempio. "
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:174
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:178
msgid "_* Push the commit to the server:"
msgstr "_* Inviare il commit al server:"
#. type: Plain text
-#: en/about_manual.ssi:172
+#: en/about_manual.ssi:182
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:176
-msgid "3~ Translation"
-msgstr "3~ Traduzione"
+#: en/about_manual.ssi:186
+msgid "3~translation Translation"
+msgstr "3~translation Traduzione"
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:188
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
"Per inviare una traduzione per una nuova lingua, seguire questi tre passi:"
#. type: Plain text
-#: en/about_manual.ssi:180
+#: en/about_manual.ssi:190
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -704,7 +745,7 @@ msgstr ""
"la attiveremo per la procedura di compilazione automatica."
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:192
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
@@ -714,11 +755,20 @@ msgstr ""
"preferisce."
#. type: Plain text
-#: en/about_manual.ssi:184
+#: en/about_manual.ssi:194
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+"_* Non dimenticare che è necessario usare #{make commit}# per assicurarsi "
+"che i manuali tradotti siano aggiornati partendo dai file po, quindi si "
+"possono verificare le modifiche con #{make build}# prima di #{git add .}#, #"
+"{git commit -a -m \"Traduzione...\" }#e #{git push}#."
+
+#. type: Plain text
+#: en/about_manual.ssi:195
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr ""
-"_* Non si dimentichi che è necessario dare un #{make commit}# per "
-"assicurarsi che i manuali tradotti siano aggiornati partendo dai file po, "
-"prima di #{git commit -a}# e #{git push}#."
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index bffc8d3..ca3b141 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-25 07:12+0100\n"
+"POT-Creation-Date: 2012-03-08 15:25+0100\n"
"PO-Revision-Date: 2011-01-03 16:23+0100\n"
"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -37,11 +37,11 @@ msgstr "@creator: Debian Live Project <debian-live at lists.debian.org>"
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Sui sistemi Debian, il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.\n"
#. type: Plain text
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-01-25\n"
+" :published: 2012-03-08\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index c16ebab..2d37de8 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-01-03 16:01+0100\n"
+"POT-Creation-Date: 2012-03-08 15:59+0100\n"
"PO-Revision-Date: 2011-01-03 16:06+0100\n"
"Last-Translator: Carlo Stemberger <carlo.stemberger at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -21,8 +21,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:156 en/about_manual.ssi:164
+#: en/about_manual.ssi:172 en/about_manual.ssi:180 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -44,20 +44,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
@@ -85,8 +85,8 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:160 en/about_manual.ssi:168 en/about_manual.ssi:176
+#: en/about_manual.ssi:184 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -108,20 +108,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
@@ -566,11 +566,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:108
+#, no-wrap
+msgid "*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.\n"
+msgstr "*{Nota:}*Quando si specifica un pacchetto che non esiste, il comportamento di live-build è determinato dalla scelta delle utilità di APT. Per ulteriori dettagli si veda {Scegliere apt o aptitude}#choosing-apt-or-aptitude."
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:110
msgid "3~ Predefined package lists"
msgstr "3~ Elenchi predefiniti di pacchetti"
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:112
msgid ""
"The simplest way to use lists is to specify one or more predefined lists "
"with the #{--packages-lists}# option. For example:"
@@ -579,13 +585,13 @@ msgstr ""
"l'opzione #{--packages-lists}#. Per esempio:"
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:116
#, no-wrap
msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:120
msgid ""
"In addition to these lists, live-build supports four virtual package lists: #"
"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
@@ -601,7 +607,7 @@ msgstr ""
"and-language-tasks."
#. type: Plain text
-#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:122
msgid ""
"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
"at http://live.debian.net are built using the corresponding virtual #{*-"
@@ -612,7 +618,7 @@ msgstr ""
"corrispondenti elenchi #{*-desktop}# virtuali."
#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:124
msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/lists/}#. To determine the packages in a given list, read the "
@@ -625,12 +631,12 @@ msgstr ""
"come descritto nella sezioni seguenti."
#. type: Plain text
-#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr "3~ Elenchi locali dei pacchetti"
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:128
msgid ""
"You may supplement or replace entirely the supplied lists using local "
"package lists stored in #{config/chroot_local-packageslists/}#."
@@ -639,7 +645,7 @@ msgstr ""
"locali dei pacchetti in #{config/chroot_local-packageslists/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed. Local package lists always override package lists "
@@ -651,12 +657,12 @@ msgstr ""
"causare effetti indesiderati perciò si raccomanda di usare nomi univoci."
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:132
msgid "3~ Local binary package lists"
msgstr "3~ Elenchi locali di pacchetti binari"
#. type: Plain text
-#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:134
msgid ""
"In case you want to include some required .deb packages to live media's #"
"{pool/}# (without installing them onto the live image) you may need to use "
@@ -671,7 +677,7 @@ msgstr ""
"immagine personalizzata di Debian per installazioni non in linea."
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:136
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed."
@@ -680,12 +686,12 @@ msgstr ""
"deve avere un suffisso #{.list}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:138
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:138
+#: en/user_customization-packages.ssi:140
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
@@ -696,7 +702,7 @@ msgstr ""
"lists/}#, in quanto portano ottimi esempi su come scrivere i propri."
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:142
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
@@ -707,7 +713,7 @@ msgstr ""
"con i seguenti contenuti:"
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -715,12 +721,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:151
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:151
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -737,7 +743,7 @@ msgstr ""
"abbia senso, come #{DISTRIBUTION}#, #{ARCHITECTURE}# o #{ARCHIVE_AREAS}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
@@ -746,7 +752,7 @@ msgstr ""
"amd64}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -755,7 +761,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:165
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:"
@@ -765,7 +771,7 @@ msgstr ""
"architecture amd64}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -774,7 +780,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:175
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 "
@@ -785,7 +791,7 @@ msgstr ""
"free}# tramite #{--archive-areas}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -794,12 +800,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr "Una condizione può coinvolegere una direttiva #{#include}#:"
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -808,17 +814,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr "Le condizioni nidificate non sono supportate."
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:197
msgid "3~ Tasks"
msgstr "3~ Task"
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:199
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 "
@@ -836,13 +842,13 @@ msgstr ""
"#, come nell'esempio seguente."
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:203
#, no-wrap
msgid " $ lb config --tasks \"mail-server file-server\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:207
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 +861,12 @@ msgstr ""
"con #{tasksel --task-packages}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:209
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:209
+#: en/user_customization-packages.ssi:211
msgid ""
"Desktop and language tasks are special cases. In the Debian Installer, if "
"the medium was prepared for a particular desktop environment flavour, the "
@@ -880,7 +886,7 @@ msgstr ""
"corrispondenti task della lingua."
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:213
msgid ""
"In live-build, therefore, these special cases are also given special "
"consideration, but with three notable differences at the time of writing."
@@ -889,7 +895,7 @@ msgstr ""
"considerazione, ma con tre differenze notevoli al momento in cui si scrive."
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:215
msgid ""
"First, there is no provision made yet automatically for language tasks, "
"although a subset of those packages are included if you specify #{lb config "
@@ -904,13 +910,13 @@ msgstr ""
"specificati nella configurazione. Per esempio:"
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:219
#, no-wrap
msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:223
msgid ""
"Second, live-build supports #{*-desktop}# virtual package lists for each of "
"the desktop flavours mentioned above, which select the #{standard-x11}# "
@@ -929,7 +935,7 @@ msgstr ""
"tasks \"gnome-desktop desktop standard laptop\"}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:225
msgid ""
"Third, if any of the tasks for these desktop flavours are selected, either "
"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-"
@@ -944,19 +950,19 @@ msgstr ""
"i vari tipi di desktop."
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:227
#, no-wrap
msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
msgstr "*{Nota:}* Esiste anche l'opzione sperimentale #{--language}# con lo scopo di sovrapporsi ai task della lingua. Se #{--language}# è specificato, per ogni lingua per la quale sia nota la presenza di pacchetti #{*-l10n}# questi verranno installati. Inoltre se uno dei modelli #{syslinux}# corrisponde alla lingua trovata, questi saranno usati al posto di quello inglese predefinito. La selezione dei pacchetti fatta con #{--language}# è un'approssimazione dei task della lingua, in quanto richiede che l'elenco dei pacchetti da includere per ogni lingua sia mantenuta all'interno di live-build, oltretutto i task della lingua sono più completi e flessibili; per quanto l'aspetto di #{syslinux}# sia comunque utile. Quindi utilizzando #{--bootloader syslinux}#, e se i modelli per la lingua specificata esistono in #{/usr/share/live/build/templates/syslinux/}# o in #{config/templates/syslinux/}#, si può considerare questa opzione, eventualmente in combinazione con i task per gar
antire che vengano installati tutti i pacchetti interessati. Esempio:\n"
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:231
#, no-wrap
msgid " $ lb config --language es\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:235
msgid ""
"Even so, it is limited in that it only supports a single language and a "
"single bootloader. Therefore, for all of these reasons, the future of this "
@@ -969,7 +975,7 @@ msgstr ""
"diverso nel prossimo rilascio di live-build."
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:237
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
@@ -978,7 +984,7 @@ msgstr ""
"modificati o di terze parti"
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:239
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 "
@@ -995,7 +1001,7 @@ msgstr ""
"utilizzati per aggiungere funzionalità proprietarie o su misura."
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:241
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -1012,22 +1018,22 @@ msgstr ""
"maint-guide/ e altrove."
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:243
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:243
+#: en/user_customization-packages.ssi:245
msgid "_* #{chroot_local-packages}#"
msgstr "_* #{chroot_local-packages}#"
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:247
msgid "_* Using a custom APT repository"
msgstr "_* Utilizzare repository APT personalizzati"
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:249
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 "
@@ -1038,14 +1044,14 @@ msgstr ""
"repository APT personalizzato è più laborioso da configurare."
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:251
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:251
+#: en/user_customization-packages.ssi:253
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -1058,7 +1064,7 @@ msgstr ""
"specificarli altrove."
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:255
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
@@ -1067,7 +1073,7 @@ msgstr ""
"semplice per farlo è usare #{dpkg-name}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:257
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
@@ -1076,12 +1082,12 @@ msgstr ""
"personalizzati presenta degli svantaggi:"
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:259
msgid "_* It is not possible to use secure APT."
msgstr "_* non è possibile usare secure APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:261
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
@@ -1090,7 +1096,7 @@ msgstr ""
"chroot_local-packages/}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:263
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
@@ -1099,13 +1105,13 @@ msgstr ""
"versione."
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:265
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:265
+#: en/user_customization-packages.ssi:267
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -1117,7 +1123,7 @@ msgstr ""
"packages-to-install."
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:269
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 "
@@ -1128,12 +1134,12 @@ msgstr ""
"per offrire aggiornamenti dei pacchetti modificati."
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:271
msgid "3~ Custom packages and APT"
msgstr "3~ Pacchetti personalizzati e APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:273
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 "
@@ -1148,7 +1154,7 @@ msgstr ""
"sceglie di installare quello con il numero di versione più alto."
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:275
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 "
@@ -1163,12 +1169,12 @@ msgstr ""
"veda {APT pinning}#apt-pinning per maggiori informazioni."
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:277
msgid "2~ Configuring APT at build time"
msgstr "2~ Configurare APT in fase di costruzione"
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:279
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 "
@@ -1185,12 +1191,12 @@ msgstr ""
"iniziano con #{apt}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:281
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:281
+#: en/user_customization-packages.ssi:283
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 "
@@ -1205,7 +1211,7 @@ msgstr ""
"quelli mancanti."
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:285
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
@@ -1214,7 +1220,7 @@ msgstr ""
"esito negativo; questo è l'impostazine predefinita."
#. type: Plain text
-#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:287
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
@@ -1223,12 +1229,12 @@ msgstr ""
"avrà successo."
#. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:289
msgid "3~ Using a proxy with APT"
msgstr "3~ Utilizzare un proxy con APT"
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:291
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}# "
@@ -1239,18 +1245,18 @@ msgstr ""
"ftp-proxy}# o #{--apt-http-proxy}# secondo necessità:"
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:295
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:299
msgid "3~ Tweaking APT to save space"
msgstr "3~ Modificare APT per risparmiare spazio"
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:301
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 "
@@ -1260,20 +1266,20 @@ msgstr ""
"in tal caso una o entrambe delle seguenti opzioni possono essere d'interesse."
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:303
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:305
+#: en/user_customization-packages.ssi:307
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:311
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 "
@@ -1288,7 +1294,7 @@ msgstr ""
"deve usare prima #{apt-get update}# per crearli."
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:313
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
@@ -1297,13 +1303,13 @@ msgstr ""
"troppo l'immagine, si può disabilitare l'opzione predefinita di APT con:"
#. type: Plain text
-#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:321
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 "
@@ -1330,12 +1336,12 @@ msgstr ""
"spiegato in {APT pinning}#apt-pinning."
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:323
msgid "3~ Passing options to apt or aptitude"
msgstr "3~ Passare opzioni ad apt o aptitude"
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:325
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 "
@@ -1348,17 +1354,17 @@ msgstr ""
"di #{apt}# e #{aptitude}# per i dettagli."
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:327
msgid "3~apt-pinning APT pinning"
msgstr "3~apt-pinning APT pinning"
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:329
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 "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/chroot_local-includes/etc/apt/preferences}#.."
msgstr ""
"Si prega di leggere prima il manuale di #{apt_preferences(5)}#. Il pinning "
"può essere configurato sia in fase di costruzione sia di esecuzione; per la "
@@ -1366,13 +1372,21 @@ msgstr ""
"{config/chroot_local-includes/etc/apt/preferences}#."
#. type: Plain text
-#: en/user_customization-packages.ssi:329
-msgid ""
-"Let's say you are building a Squeeze live system but need all #{live-*}# "
-"packages to be installed from Sid at build time. You need to add Sid to your "
-"APT sources and pin it so that only the packages you want are installed from "
-"it at build time and all others are taken from the target system "
-"distribution, Squeeze. The following will accomplish this:"
+#: en/user_customization-packages.ssi:331
+#, fuzzy
+#| msgid ""
+#| "Let's say you are building a Squeeze live system but need all #{live-*}# "
+#| "packages to be installed from Sid at build time. You need to add Sid to "
+#| "your APT sources and pin it so that only the packages you want are "
+#| "installed from it at build time and all others are taken from the target "
+#| "system distribution, Squeeze. The following will accomplish this:"
+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 "
+"time. You need to add Sid to your APT sources and pin it so that only the "
+"packages you want are installed from it at build time and all others are "
+"taken from the target system distribution, Squeeze. The following will "
+"accomplish this:"
msgstr ""
"Nell'ipotesi di creare un sistema live Squeeze e avendo la necessità di "
"installare tutti i pacchetti #{live-*}# da Sid in questa fase, bisogna "
@@ -1381,18 +1395,18 @@ msgstr ""
"dalla distribuzione principale, Squeeze. Quanto segue servirà allo scopo:"
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:339
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
-" Package: live-*\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << END\n"
+" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:344
#, no-wrap
msgid ""
" Package: *\n"
@@ -1402,7 +1416,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:348
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 "
@@ -1419,7 +1433,7 @@ msgstr ""
"aggiungendo a #{config/chroot_apt/preferences}# la seguente definizione:"
#. type: Plain text
-#: en/user_customization-packages.ssi:352
+#: en/user_customization-packages.ssi:354
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 5528796..84ce3bf 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -1,19 +1,20 @@
# Brazilian Portuguese translations for live-manual package
# 2010 Bruno Gurgel <bruno.gurgel at gmail.com>
# This file is distributed under the same license as the live-config package.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-20 16:58-0400\n"
-"PO-Revision-Date: 2010-10-22 18:16-0300\n"
-"Last-Translator: Bruno Gurgel <bruno.gurgel at gmail.com>\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2012-03-08 15:25+0100\n"
+"PO-Revision-Date: 2012-03-08 15:36+0100\n"
+"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
#: en/about_manual.ssi:2
@@ -28,15 +29,16 @@ msgstr "1~about-manual Sobre esse manual"
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. It does not include end-"
-"user documentation for using a Debian Live system as far as things are live "
-"specific."
+"This manual serves as a single access point to all documentation related to "
+"the Debian Live project and in particular applies to the software produced "
+"by the project for the Debian 6.0 \"Squeeze\" release. While it is primarily "
+"focused on helping you build a live system and not on end-user topics, an "
+"end-user may find some useful information in these sections: {The Basics}"
+"#the-basics covers preparing images to be booted from media or the network, "
+"and {Customizing run time behaviours}#customizing-run-time-behaviours "
+"describes some options that may be specified at the boot prompt, such as "
+"selecting a keyboard layout and locale, and using persistence."
msgstr ""
-"O principal objetivo deste manual é servir como único ponto de acesso para "
-"toda a documentação relacionada ao projeto Debian Live. Ele não inclui "
-"documentação do usuário para usar o sistema Debian Live nem sobre as coisas "
-"que são Live específicas."
#. type: Plain text
#: en/about_manual.ssi:8
@@ -66,19 +68,21 @@ msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
msgstr ""
#. type: Plain text
@@ -322,8 +326,8 @@ msgstr "_* Trent W. Buck"
#. type: Plain text
#: en/about_manual.ssi:76
-msgid "2~ Contributing to this document"
-msgstr "2~ Contribuindo com esse documento"
+msgid "2~how-to-contribute Contributing to this document"
+msgstr "2~how-to-contribute Contribuindo com esse documento"
#. type: Plain text
#: en/about_manual.ssi:78
@@ -359,8 +363,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:156 en/about_manual.ssi:164
+#: en/about_manual.ssi:172 en/about_manual.ssi:180 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -382,20 +386,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
@@ -428,8 +432,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:160 en/about_manual.ssi:168 en/about_manual.ssi:176
+#: en/about_manual.ssi:184 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -451,20 +455,20 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
@@ -537,7 +541,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
+#, fuzzy
+#| msgid "3~ Applying patches"
+msgid "3~ Applying changes"
msgstr "3~ Aplicando patches"
#. type: Plain text
@@ -562,11 +568,11 @@ msgstr "_* Obter a chave publica de commit:"
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
-" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-" -O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-" -O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-" $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
msgstr ""
#. type: Plain text
@@ -581,8 +587,8 @@ msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
" Host live.debian.net\n"
" Hostname live.debian.net\n"
-" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" User git\n"
+" IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
" EOF\n"
msgstr ""
@@ -592,14 +598,23 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Fazer o checkout de um clone do manual por ssh:"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone git at live.debian.net:/live-manual.git\n"
+" $ cd live-manual && git checkout debian-next\n"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:152
msgid ""
+"}code _* Note that you should commit any changes on the debian-next branch, "
+"not on the debian branch."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:154
+msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
"translation files:"
@@ -609,18 +624,35 @@ msgstr ""
"atualizar os arquivos de tradução. "
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:158
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:162
+msgid "_* Then"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:166
+#, no-wrap
+msgid " $ git add .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:170
+#, fuzzy
+#| msgid ""
+#| "_* After sanitizing, commit the changes. Write commit messages that "
+#| "consist of full, useful sentences in English, starting with a capital "
+#| "letter and ending with a full stop. Usually, these will start with the "
+#| "form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
"_* Depois de higiênizar submeta as mudançãs. Escreva mensagens de submissão, "
"que consistem em sentanças completas úteis, começando por letra maiuscula e "
@@ -628,34 +660,34 @@ msgstr ""
"Adding/Removing/Correcting/Translating'."
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:174
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:178
msgid "_* Push the commit to the server:"
msgstr "_* Enviar as submissões para os servidor."
#. type: Plain text
-#: en/about_manual.ssi:172
+#: en/about_manual.ssi:182
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:176
-msgid "3~ Translation"
+#: en/about_manual.ssi:186
+msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:188
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:180
+#: en/about_manual.ssi:190
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -665,15 +697,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:192
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:184
+#: en/about_manual.ssi:194
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:195
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr ""
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index cff6a01..dab0cd4 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-25 07:12+0100\n"
+"POT-Creation-Date: 2012-03-08 15:25+0100\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -36,7 +36,7 @@ msgstr ""
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-01-25\n"
+" :published: 2012-03-08\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 1c7b2e7..0719810 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-01-03 16:01+0100\n"
+"POT-Creation-Date: 2012-03-08 15:59+0100\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,8 +19,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:156 en/about_manual.ssi:164
+#: en/about_manual.ssi:172 en/about_manual.ssi:180 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -42,20 +42,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
@@ -83,8 +83,8 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:160 en/about_manual.ssi:168 en/about_manual.ssi:176
+#: en/about_manual.ssi:184 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -106,20 +106,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
@@ -450,24 +450,30 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:108
-msgid "3~ Predefined package lists"
+#, no-wrap
+msgid "*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:110
+msgid "3~ Predefined package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:112
msgid ""
"The simplest way to use lists is to specify one or more predefined lists "
"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:116
#, no-wrap
msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:120
msgid ""
"In addition to these lists, live-build supports four virtual package lists: #"
"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
@@ -477,7 +483,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:122
msgid ""
"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
"at http://live.debian.net are built using the corresponding virtual #{*-"
@@ -485,7 +491,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:124
msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/lists/}#. To determine the packages in a given list, read the "
@@ -494,19 +500,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:128
msgid ""
"You may supplement or replace entirely the supplied lists using local "
"package lists stored in #{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed. Local package lists always override package lists "
@@ -515,12 +521,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:132
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:134
msgid ""
"In case you want to include some required .deb packages to live media's #"
"{pool/}# (without installing them onto the live image) you may need to use "
@@ -530,19 +536,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:136
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:138
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:140
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
@@ -550,7 +556,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:142
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
@@ -558,7 +564,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -566,12 +572,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -582,14 +588,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -598,14 +604,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:165
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:169
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -614,7 +620,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:175
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 "
@@ -622,7 +628,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -631,12 +637,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -645,17 +651,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:197
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:199
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 "
@@ -666,13 +672,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:203
#, no-wrap
msgid " $ lb config --tasks \"mail-server file-server\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:207
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, "
@@ -681,12 +687,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:209
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:211
msgid ""
"Desktop and language tasks are special cases. In the Debian Installer, if "
"the medium was prepared for a particular desktop environment flavour, the "
@@ -698,14 +704,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:213
msgid ""
"In live-build, therefore, these special cases are also given special "
"consideration, but with three notable differences at the time of writing."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:215
msgid ""
"First, there is no provision made yet automatically for language tasks, "
"although a subset of those packages are included if you specify #{lb config "
@@ -715,13 +721,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:219
#, no-wrap
msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:223
msgid ""
"Second, live-build supports #{*-desktop}# virtual package lists for each of "
"the desktop flavours mentioned above, which select the #{standard-x11}# "
@@ -733,7 +739,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:225
msgid ""
"Third, if any of the tasks for these desktop flavours are selected, either "
"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-"
@@ -743,19 +749,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:227
#, no-wrap
msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:231
#, no-wrap
msgid " $ lb config --language es\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:235
msgid ""
"Even so, it is limited in that it only supports a single language and a "
"single bootloader. Therefore, for all of these reasons, the future of this "
@@ -764,14 +770,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:237
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:239
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 "
@@ -782,7 +788,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:241
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -793,22 +799,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:243
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:245
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:247
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:249
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 "
@@ -816,12 +822,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:251
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:253
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -830,45 +836,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:255
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:255
+#: en/user_customization-packages.ssi:257
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:259
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:261
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:263
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:265
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:267
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -876,7 +882,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:269
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 "
@@ -884,12 +890,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:271
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:273
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 "
@@ -899,7 +905,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:275
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 "
@@ -909,12 +915,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:277
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:279
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 "
@@ -925,12 +931,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:281
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:283
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 "
@@ -940,26 +946,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:285
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:285
+#: en/user_customization-packages.ssi:287
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:287
+#: en/user_customization-packages.ssi:289
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:291
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}# "
@@ -967,18 +973,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:295
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:299
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:301
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 "
@@ -986,20 +992,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:303
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:305
+#: en/user_customization-packages.ssi:307
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:311
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 "
@@ -1009,20 +1015,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:313
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:315
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:321
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 "
@@ -1038,12 +1044,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:323
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:325
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 "
@@ -1052,42 +1058,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:327
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:329
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 "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/chroot_local-includes/etc/apt/preferences}#.."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:331
msgid ""
-"Let's say you are building a Squeeze live system but need all #{live-*}# "
-"packages to be installed from Sid at build time. You need to add Sid to your "
-"APT sources and pin it so that only the packages you want are installed from "
-"it at build time and all others are taken from the target system "
-"distribution, Squeeze. The following will accomplish this:"
+"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 "
+"time. You need to add Sid to your APT sources and pin it so that only the "
+"packages you want are installed from it at build time and all others are "
+"taken from the target system distribution, Squeeze. The following will "
+"accomplish this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:339
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
-" Package: live-*\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << END\n"
+" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:344
#, no-wrap
msgid ""
" Package: *\n"
@@ -1097,7 +1104,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:348
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 "
@@ -1108,7 +1115,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:352
+#: en/user_customization-packages.ssi:354
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index 21adac7..b4972cb 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -1,18 +1,20 @@
# Romanian translations for live-manual package
# 2010 Eugen Paiuc <linux51 at bluewin.ch>
# This file is distributed under the same license as the live-manual package.
+# Carlos Zuferri «chals» <chals at altorricon.com>, 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-20 16:58-0400\n"
-"PO-Revision-Date: 2010-10-23 10:34-0200\n"
-"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2012-03-08 15:25+0100\n"
+"PO-Revision-Date: 2012-03-08 15:35+0100\n"
+"Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
+"Language-Team: <debian-live at lists.debian.org>\n"
"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
#: en/about_manual.ssi:2
@@ -27,15 +29,16 @@ msgstr "1~about-manual Despre acest manual"
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. It does not include end-"
-"user documentation for using a Debian Live system as far as things are live "
-"specific."
+"This manual serves as a single access point to all documentation related to "
+"the Debian Live project and in particular applies to the software produced "
+"by the project for the Debian 6.0 \"Squeeze\" release. While it is primarily "
+"focused on helping you build a live system and not on end-user topics, an "
+"end-user may find some useful information in these sections: {The Basics}"
+"#the-basics covers preparing images to be booted from media or the network, "
+"and {Customizing run time behaviours}#customizing-run-time-behaviours "
+"describes some options that may be specified at the boot prompt, such as "
+"selecting a keyboard layout and locale, and using persistence."
msgstr ""
-"Scopul principal al acestui manual este de a accesa intreaga documentatie a "
-"proiectului Debian Live intr-un singur loc. Dar aici nu vor fii gasite "
-"documantatii pentru utilizatorul final cu exceptia celor legate de sistemul "
-"live."
#. type: Plain text
#: en/about_manual.ssi:8
@@ -63,19 +66,21 @@ msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
msgstr ""
#. type: Plain text
@@ -318,8 +323,8 @@ msgstr "_* Trent W. Buck"
#. type: Plain text
#: en/about_manual.ssi:76
-msgid "2~ Contributing to this document"
-msgstr "2~ Cum se poate contribui la acest document"
+msgid "2~how-to-contribute Contributing to this document"
+msgstr "2~how-to-contribute Cum se poate contribui la acest document"
#. type: Plain text
#: en/about_manual.ssi:78
@@ -359,8 +364,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:156 en/about_manual.ssi:164
+#: en/about_manual.ssi:172 en/about_manual.ssi:180 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -382,20 +387,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
@@ -428,8 +433,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:160 en/about_manual.ssi:168 en/about_manual.ssi:176
+#: en/about_manual.ssi:184 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -451,20 +456,20 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
@@ -537,7 +542,9 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
+#, fuzzy
+#| msgid "3~ Applying patches"
+msgid "3~ Applying changes"
msgstr "3~ Aplicarea de patch-uri"
#. type: Plain text
@@ -561,11 +568,11 @@ msgstr "_* Fetch the public commit key:"
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
-" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-" -O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-" -O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-" $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
msgstr ""
#. type: Plain text
@@ -580,8 +587,8 @@ msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
" Host live.debian.net\n"
" Hostname live.debian.net\n"
-" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" User git\n"
+" IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
" EOF\n"
msgstr ""
@@ -591,32 +598,58 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr "_* Checkout un clon al manualului prin ssh:"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone git at live.debian.net:/live-manual.git\n"
+" $ cd live-manual && git checkout debian-next\n"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:152
msgid ""
+"}code _* Note that you should commit any changes on the debian-next branch, "
+"not on the debian branch."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:154
+msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
"translation files:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:158
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:162
+msgid "_* Then"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:166
+#, no-wrap
+msgid " $ git add .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:170
+#, fuzzy
+#| msgid ""
+#| "_* After sanitizing, commit the changes. Write commit messages that "
+#| "consist of full, useful sentences in English, starting with a capital "
+#| "letter and ending with a full stop. Usually, these will start with the "
+#| "form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
"_* Dupa 'sanitizare' 'commit' schimbarile. Scrieti mesajele de commit, care "
"constau in propozitii clare, care incep cu litere Mari, si se incheie cu "
@@ -624,34 +657,34 @@ msgstr ""
"Correcting/Translating':"
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:174
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:178
msgid "_* Push the commit to the server:"
msgstr "_* Primite commit-ul la server:"
#. type: Plain text
-#: en/about_manual.ssi:172
+#: en/about_manual.ssi:182
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:176
-msgid "3~ Translation"
+#: en/about_manual.ssi:186
+msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:188
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:180
+#: en/about_manual.ssi:190
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -661,15 +694,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:192
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:184
+#: en/about_manual.ssi:194
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:195
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr ""
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index a8911e2..b52e44b 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-01-25 07:12+0100\n"
+"POT-Creation-Date: 2012-03-08 15:25+0100\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,7 +37,7 @@ msgstr ""
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-01-25\n"
+" :published: 2012-03-08\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index a415dcc..71a903a 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-01-03 16:01+0100\n"
+"POT-Creation-Date: 2012-03-08 15:59+0100\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -20,8 +20,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:156 en/about_manual.ssi:164
+#: en/about_manual.ssi:172 en/about_manual.ssi:180 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -43,20 +43,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
@@ -84,8 +84,8 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:160 en/about_manual.ssi:168 en/about_manual.ssi:176
+#: en/about_manual.ssi:184 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -107,20 +107,20 @@ msgstr "code{"
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
@@ -451,24 +451,30 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:108
-msgid "3~ Predefined package lists"
+#, no-wrap
+msgid "*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:110
+msgid "3~ Predefined package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:112
msgid ""
"The simplest way to use lists is to specify one or more predefined lists "
"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:116
#, no-wrap
msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:120
msgid ""
"In addition to these lists, live-build supports four virtual package lists: #"
"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
@@ -478,7 +484,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:122
msgid ""
"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
"at http://live.debian.net are built using the corresponding virtual #{*-"
@@ -486,7 +492,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:124
msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/lists/}#. To determine the packages in a given list, read the "
@@ -495,19 +501,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:128
msgid ""
"You may supplement or replace entirely the supplied lists using local "
"package lists stored in #{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed. Local package lists always override package lists "
@@ -516,12 +522,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:132
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:134
msgid ""
"In case you want to include some required .deb packages to live media's #"
"{pool/}# (without installing them onto the live image) you may need to use "
@@ -531,19 +537,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:136
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:138
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:140
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
@@ -551,7 +557,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:142
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
@@ -559,7 +565,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -567,12 +573,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -583,14 +589,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -599,14 +605,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:165
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:169
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -615,7 +621,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:175
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 "
@@ -623,7 +629,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -632,12 +638,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -646,17 +652,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:197
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:199
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 "
@@ -667,13 +673,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:203
#, no-wrap
msgid " $ lb config --tasks \"mail-server file-server\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:207
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, "
@@ -682,12 +688,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:209
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:211
msgid ""
"Desktop and language tasks are special cases. In the Debian Installer, if "
"the medium was prepared for a particular desktop environment flavour, the "
@@ -699,14 +705,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:213
msgid ""
"In live-build, therefore, these special cases are also given special "
"consideration, but with three notable differences at the time of writing."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:215
msgid ""
"First, there is no provision made yet automatically for language tasks, "
"although a subset of those packages are included if you specify #{lb config "
@@ -716,13 +722,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:219
#, no-wrap
msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:223
msgid ""
"Second, live-build supports #{*-desktop}# virtual package lists for each of "
"the desktop flavours mentioned above, which select the #{standard-x11}# "
@@ -734,7 +740,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:225
msgid ""
"Third, if any of the tasks for these desktop flavours are selected, either "
"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-"
@@ -744,19 +750,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:227
#, no-wrap
msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:231
#, no-wrap
msgid " $ lb config --language es\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:235
msgid ""
"Even so, it is limited in that it only supports a single language and a "
"single bootloader. Therefore, for all of these reasons, the future of this "
@@ -765,14 +771,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:237
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:239
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 "
@@ -783,7 +789,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:241
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -794,22 +800,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:243
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:245
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:247
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:249
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 "
@@ -817,12 +823,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:251
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:253
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -831,45 +837,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:255
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:255
+#: en/user_customization-packages.ssi:257
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:259
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:261
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:263
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:265
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:267
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -877,7 +883,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:269
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 "
@@ -885,12 +891,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:271
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:273
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 "
@@ -900,7 +906,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:275
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 "
@@ -910,12 +916,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:277
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:279
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 "
@@ -926,12 +932,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:281
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:283
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 "
@@ -941,26 +947,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:285
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:285
+#: en/user_customization-packages.ssi:287
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:287
+#: en/user_customization-packages.ssi:289
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:291
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}# "
@@ -968,18 +974,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:295
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:299
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:301
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 "
@@ -987,20 +993,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:303
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:305
+#: en/user_customization-packages.ssi:307
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:311
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 "
@@ -1010,20 +1016,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:313
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:315
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:321
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 "
@@ -1039,12 +1045,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:323
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:325
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 "
@@ -1053,42 +1059,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:327
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:329
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 "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/chroot_local-includes/etc/apt/preferences}#.."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:331
msgid ""
-"Let's say you are building a Squeeze live system but need all #{live-*}# "
-"packages to be installed from Sid at build time. You need to add Sid to your "
-"APT sources and pin it so that only the packages you want are installed from "
-"it at build time and all others are taken from the target system "
-"distribution, Squeeze. The following will accomplish this:"
+"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 "
+"time. You need to add Sid to your APT sources and pin it so that only the "
+"packages you want are installed from it at build time and all others are "
+"taken from the target system distribution, Squeeze. The following will "
+"accomplish this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:339
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
-" Package: live-*\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << END\n"
+" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:344
#, no-wrap
msgid ""
" Package: *\n"
@@ -1098,7 +1105,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:348
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 "
@@ -1109,7 +1116,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:352
+#: en/user_customization-packages.ssi:354
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 227e0aa..b53e76f 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-01-20 16:58-0400\n"
+"POT-Creation-Date: 2012-03-08 15:25+0100\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"
@@ -29,10 +29,15 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:6
msgid ""
-"The main goal of this manual is to serve as a single access point to all "
-"documentation related to the Debian Live project. It does not include end-"
-"user documentation for using a Debian Live system as far as things are live "
-"specific."
+"This manual serves as a single access point to all documentation related to "
+"the Debian Live project and in particular applies to the software produced "
+"by the project for the Debian 6.0 \"Squeeze\" release. While it is primarily "
+"focused on helping you build a live system and not on end-user topics, an "
+"end-user may find some useful information in these sections: {The Basics}"
+"#the-basics covers preparing images to be booted from media or the network, "
+"and {Customizing run time behaviours}#customizing-run-time-behaviours "
+"describes some options that may be specified at the boot prompt, such as "
+"selecting a keyboard layout and locale, and using persistence."
msgstr ""
#. type: Plain text
@@ -57,19 +62,21 @@ msgid ""
"While we believe that everything in this manual is important to at least "
"some of our users, we realize it is a lot of material to cover and that you "
"may wish to experience early success using the software before delving into "
-"the details. Therefore, we have provided three tutorials in the {Examples}"
-"#examples section designed to teach you image building and customization "
-"basics. Read {Using the examples}#using-the-examples first, followed by "
-"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
-"utility}#tutorial-2 and finally {Tutorial 3: A personalized image}"
-"#tutorial-3. By the end of these tutorials, you will have a taste of what "
-"can be done with Debian Live. We encourage you to return to more in-depth "
-"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
-"or skipping {Building a netboot image}#building-netboot-image, and finishing "
-"by reading the {Customization overview}#customization-overview and the "
-"chapters that follow it. By this point, we hope you are thoroughly excited "
-"by what can be done with Debian Live and motivated to read the rest of the "
-"manual, cover-to-cover."
+"the details. Therefore, we suggest reading in the following order. First, "
+"read this chapter, {About this manual}#about-manual, from the beginning and "
+"ending with the {Terms}#terms section. Next, skip to the three tutorials at "
+"the front of the {Examples}#examples section designed to teach you image "
+"building and customization basics. Read {Using the examples}#using-the-"
+"examples first, followed by {Tutorial 1: A standard image}#tutorial-1, "
+"{Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A "
+"personalized image}#tutorial-3. By the end of these tutorials, you will have "
+"a taste of what can be done with Debian Live. We encourage you to return to "
+"more in-depth study of the manual, perhaps next reading {The basics}#the-"
+"basics, skimming or skipping {Building a netboot image}#building-netboot-"
+"image, and finishing by reading the {Customization overview}#customization-"
+"overview and the chapters that follow it. By this point, we hope you are "
+"thoroughly excited by what can be done with Debian Live and motivated to "
+"read the rest of the manual, cover-to-cover."
msgstr ""
#. type: Plain text
@@ -273,7 +280,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:76
-msgid "2~ Contributing to this document"
+msgid "2~how-to-contribute Contributing to this document"
msgstr ""
#. type: Plain text
@@ -304,8 +311,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:156 en/about_manual.ssi:164
+#: en/about_manual.ssi:172 en/about_manual.ssi:180 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -327,20 +334,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
@@ -373,8 +380,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:160 en/about_manual.ssi:168 en/about_manual.ssi:176
+#: en/about_manual.ssi:184 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -396,20 +403,20 @@ msgstr ""
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
@@ -477,7 +484,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:114
-msgid "3~ Applying patches"
+msgid "3~ Applying changes"
msgstr ""
#. type: Plain text
@@ -498,11 +505,11 @@ msgstr ""
#, no-wrap
msgid ""
" $ mkdir -p ~/.ssh/identity.d\n"
-" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \\\n"
-" -O ~/.ssh/identity.d/gitosis at live.debian.net\n"
-" $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \\\n"
-" -O ~/.ssh/identity.d/gitosis at live.debian.net.pub\n"
-" $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net\n"
+" $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \\\n"
+" -O ~/.ssh/identity.d/git at live.debian.net.pub\n"
+" $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*\n"
msgstr ""
#. type: Plain text
@@ -517,8 +524,8 @@ msgid ""
" $ cat >> ~/.ssh/config << EOF\n"
" Host live.debian.net\n"
" Hostname live.debian.net\n"
-" User gitosis\n"
-" IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net\n"
+" User git\n"
+" IdentityFile ~/.ssh/identity.d/git at live.debian.net\n"
" EOF\n"
msgstr ""
@@ -528,63 +535,83 @@ msgid "_* Check out a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:149
#, no-wrap
-msgid " $ git clone gitosis at live.debian.net:/live-manual.git\n"
+msgid ""
+" $ git clone git at live.debian.net:/live-manual.git\n"
+" $ cd live-manual && git checkout debian-next\n"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:152
msgid ""
+"}code _* Note that you should commit any changes on the debian-next branch, "
+"not on the debian branch."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:154
+msgid ""
"_* After editing the files in #{manual/en/}#, please call the 'commit' "
"target in the top level directory to sanitize the files and update the "
"translation files:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:158
#, no-wrap
msgid " $ make commit\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:162
+msgid "_* Then"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:166
+#, no-wrap
+msgid " $ git add .\n"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:170
msgid ""
-"_* After sanitizing, commit the changes. Write commit messages that consist "
-"of full, useful sentences in English, starting with a capital letter and "
-"ending with a full stop. Usually, these will start with the form 'Fixing/"
-"Adding/Removing/Correcting/Translating', e.g."
+"_* After sanitizing and adding the files, commit the changes. Write commit "
+"messages that consist of full, useful sentences in English, starting with a "
+"capital letter and ending with a full stop. Usually, these will start with "
+"the form 'Fixing/Adding/Removing/Correcting/Translating', e.g."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:164
+#: en/about_manual.ssi:174
#, no-wrap
msgid " $ git commit -a -m \"Adding a section on applying patches.\"\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:168
+#: en/about_manual.ssi:178
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:172
+#: en/about_manual.ssi:182
#, no-wrap
msgid " $ git push\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:176
-msgid "3~ Translation"
+#: en/about_manual.ssi:186
+msgid "3~translation Translation"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:178
+#: en/about_manual.ssi:188
msgid "To submit a translation for a new language, follow these three steps:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:180
+#: en/about_manual.ssi:190
msgid ""
"_* Translate the about_manual.ssi.pot, about_project.ssi.pot and index.html."
"in.pot files to your language with your favourite editor (such as poedit). "
@@ -594,15 +621,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:182
+#: en/about_manual.ssi:192
msgid ""
"_* Once the new language is added, you can randomly start translating all po "
"files in #{manual/po/}#."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:184
+#: en/about_manual.ssi:194
msgid ""
"_* Don't forget you need #{make commit}# to ensure the translated manuals "
-"are updated from the po files, before #{git commit -a}# and #{git push}#."
+"are updated from the po files and then you can review your changes launching "
+"#{make build}# before #{git add .}#, #{git commit -a -m \"Translating...\"}# "
+"and #{git push}#."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:195
+#, no-wrap
+msgid "*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.\n"
msgstr ""
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index bc798fb..f670a00 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-01-25 07:12+0100\n"
+"POT-Creation-Date: 2012-03-08 15:25+0100\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"
@@ -36,7 +36,7 @@ msgstr ""
#, no-wrap
msgid ""
"@rights:\n"
-" :copyright: Copyright (C) 2006-2011 Debian Live Project\n"
+" :copyright: Copyright (C) 2006-2012 Debian Live Project\n"
" :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.\n"
msgstr ""
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-01-25\n"
+" :published: 2012-03-08\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 0f3a234..271886d 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-01-03 16:01+0100\n"
+"POT-Creation-Date: 2012-03-08 15:59+0100\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"
@@ -19,8 +19,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:60
+#: en/about_manual.ssi:146 en/about_manual.ssi:156 en/about_manual.ssi:164
+#: en/about_manual.ssi:172 en/about_manual.ssi:180 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
@@ -42,20 +42,20 @@ msgstr ""
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
#: en/user_customization-packages.ssi:94
-#: en/user_customization-packages.ssi:112
-#: en/user_customization-packages.ssi:142
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:185
-#: en/user_customization-packages.ssi:199
-#: en/user_customization-packages.ssi:215
-#: en/user_customization-packages.ssi:227
-#: en/user_customization-packages.ssi:291
-#: en/user_customization-packages.ssi:303
-#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331
-#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:144
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:305
+#: en/user_customization-packages.ssi:315
+#: en/user_customization-packages.ssi:333
+#: en/user_customization-packages.ssi:350 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
@@ -83,8 +83,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:64
+#: en/about_manual.ssi:160 en/about_manual.ssi:168 en/about_manual.ssi:176
+#: en/about_manual.ssi:184 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
@@ -106,20 +106,20 @@ msgstr ""
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
#: en/user_customization-packages.ssi:98
-#: en/user_customization-packages.ssi:116
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:181
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:203
-#: en/user_customization-packages.ssi:219
-#: en/user_customization-packages.ssi:231
-#: en/user_customization-packages.ssi:295
-#: en/user_customization-packages.ssi:307
-#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:356 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
@@ -450,24 +450,30 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:108
-msgid "3~ Predefined package lists"
+#, no-wrap
+msgid "*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.\n"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:110
+msgid "3~ Predefined package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:112
msgid ""
"The simplest way to use lists is to specify one or more predefined lists "
"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:116
#, no-wrap
msgid " $ lb config --packages-lists \"gnome-core rescue\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:118
+#: en/user_customization-packages.ssi:120
msgid ""
"In addition to these lists, live-build supports four virtual package lists: #"
"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
@@ -477,7 +483,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:122
msgid ""
"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
"at http://live.debian.net are built using the corresponding virtual #{*-"
@@ -485,7 +491,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:122
+#: en/user_customization-packages.ssi:124
msgid ""
"The default location for the list files on your system is #{/usr/share/live/"
"build/lists/}#. To determine the packages in a given list, read the "
@@ -494,19 +500,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:124
+#: en/user_customization-packages.ssi:126
msgid "3~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:126
+#: en/user_customization-packages.ssi:128
msgid ""
"You may supplement or replace entirely the supplied lists using local "
"package lists stored in #{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:128
+#: en/user_customization-packages.ssi:130
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed. Local package lists always override package lists "
@@ -515,12 +521,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:130
+#: en/user_customization-packages.ssi:132
msgid "3~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:132
+#: en/user_customization-packages.ssi:134
msgid ""
"In case you want to include some required .deb packages to live media's #"
"{pool/}# (without installing them onto the live image) you may need to use "
@@ -530,19 +536,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:134
+#: en/user_customization-packages.ssi:136
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:136
+#: en/user_customization-packages.ssi:138
msgid "3~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:138
+#: en/user_customization-packages.ssi:140
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
@@ -550,7 +556,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:140
+#: en/user_customization-packages.ssi:142
msgid ""
"For example, to make a list that includes the predefined #{gnome}# list plus "
"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
@@ -558,7 +564,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:147
#, no-wrap
msgid ""
" #include <gnome>\n"
@@ -566,12 +572,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:151
msgid "3~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:153
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -582,14 +588,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:155
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:161
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -598,14 +604,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:165
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:169
+#: en/user_customization-packages.ssi:171
#, no-wrap
msgid ""
" #if ARCHITECTURE i386 amd64\n"
@@ -614,7 +620,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:175
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 "
@@ -622,7 +628,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
+#: en/user_customization-packages.ssi:181
#, no-wrap
msgid ""
" #if ARCHIVE_AREAS contrib non-free\n"
@@ -631,12 +637,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:185
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:191
#, no-wrap
msgid ""
" #if ARCHITECTURE amd64\n"
@@ -645,17 +651,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:195
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:197
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:199
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 "
@@ -666,13 +672,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:203
#, no-wrap
msgid " $ lb config --tasks \"mail-server file-server\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:207
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, "
@@ -681,12 +687,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:209
msgid "3~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:211
msgid ""
"Desktop and language tasks are special cases. In the Debian Installer, if "
"the medium was prepared for a particular desktop environment flavour, the "
@@ -698,14 +704,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:213
msgid ""
"In live-build, therefore, these special cases are also given special "
"consideration, but with three notable differences at the time of writing."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:215
msgid ""
"First, there is no provision made yet automatically for language tasks, "
"although a subset of those packages are included if you specify #{lb config "
@@ -715,13 +721,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:219
#, no-wrap
msgid " $ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\"\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:223
msgid ""
"Second, live-build supports #{*-desktop}# virtual package lists for each of "
"the desktop flavours mentioned above, which select the #{standard-x11}# "
@@ -733,7 +739,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:225
msgid ""
"Third, if any of the tasks for these desktop flavours are selected, either "
"explicitly through #{--tasks}# or implicitly by #{--packages-lists}#, live-"
@@ -743,19 +749,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:227
#, no-wrap
msgid "*{Note:}* There is also an experimental #{--language}# option that has an overlapping purpose with language tasks. For any language for which it is known that there are #{*-l10n}# packages, if #{--language}# is specified, those packages will be installed. Furthermore, if any #{syslinux}# templates matching the language are found, they will be used instead of the default English templates. The package selection done by #{--language}# is a poor approximation of language tasks, as it requires that the list of packages to include per language be maintained internally in live-build, and besides, language tasks are more comprehensive and flexible. However, the #{syslinux}# aspect is still useful. Thus, if you use #{--bootloader syslinux}# and templates for the specified language exist either in #{/usr/share/live/build/templates/syslinux/}# or #{config/templates/syslinux/}#, consider using this option, possibly in combination with tasks to ensure all relevant packages are in
stalled. For example:\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:231
#, no-wrap
msgid " $ lb config --language es\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:235
msgid ""
"Even so, it is limited in that it only supports a single language and a "
"single bootloader. Therefore, for all of these reasons, the future of this "
@@ -764,14 +770,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:237
msgid ""
"2~installing-modified-or-third-party-packages Installing modified or third-"
"party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:239
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 "
@@ -782,7 +788,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:241
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -793,22 +799,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:243
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:245
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:247
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:249
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 "
@@ -816,12 +822,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:249
+#: en/user_customization-packages.ssi:251
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:253
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -830,45 +836,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:255
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:255
+#: en/user_customization-packages.ssi:257
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:259
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:261
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:263
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:265
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:267
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See {Choosing "
@@ -876,7 +882,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:269
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 "
@@ -884,12 +890,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:271
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:273
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 "
@@ -899,7 +905,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:275
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 "
@@ -909,12 +915,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:277
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:279
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 "
@@ -925,12 +931,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:279
+#: en/user_customization-packages.ssi:281
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:281
+#: en/user_customization-packages.ssi:283
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 "
@@ -940,26 +946,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:285
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:285
+#: en/user_customization-packages.ssi:287
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:287
+#: en/user_customization-packages.ssi:289
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:291
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}# "
@@ -967,18 +973,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:293
+#: en/user_customization-packages.ssi:295
#, no-wrap
msgid " $ lb config --apt-http-proxy http://proxy/\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:297
+#: en/user_customization-packages.ssi:299
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:299
+#: en/user_customization-packages.ssi:301
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 "
@@ -986,20 +992,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:301
+#: en/user_customization-packages.ssi:303
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:305
+#: en/user_customization-packages.ssi:307
#, no-wrap
msgid " $ lb config --binary-indices false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:309
+#: en/user_customization-packages.ssi:311
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 "
@@ -1009,20 +1015,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:311
+#: en/user_customization-packages.ssi:313
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:315
+#: en/user_customization-packages.ssi:317
#, no-wrap
msgid " $ lb config --apt-recommends false\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:319
+#: en/user_customization-packages.ssi:321
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 "
@@ -1038,12 +1044,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:321
+#: en/user_customization-packages.ssi:323
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:323
+#: en/user_customization-packages.ssi:325
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 "
@@ -1052,42 +1058,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:325
+#: en/user_customization-packages.ssi:327
msgid "3~apt-pinning APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:327
+#: en/user_customization-packages.ssi:329
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 "
"the former, create #{config/chroot_apt/preferences}#. For the latter, create "
-"#{config/chroot_local-includes/etc/apt/preferences}#."
+"#{config/chroot_local-includes/etc/apt/preferences}#.."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:329
+#: en/user_customization-packages.ssi:331
msgid ""
-"Let's say you are building a Squeeze live system but need all #{live-*}# "
-"packages to be installed from Sid at build time. You need to add Sid to your "
-"APT sources and pin it so that only the packages you want are installed from "
-"it at build time and all others are taken from the target system "
-"distribution, Squeeze. The following will accomplish this:"
+"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 "
+"time. You need to add Sid to your APT sources and pin it so that only the "
+"packages you want are installed from it at build time and all others are "
+"taken from the target system distribution, Squeeze. The following will "
+"accomplish this:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:337
+#: en/user_customization-packages.ssi:339
#, no-wrap
msgid ""
-" $ echo \"deb http://mirror/debian sid main\" > config/chroot_sources/sid.chroot\n"
-" $ cat >>config/chroot_apt/preferences <<END\n"
-" Package: live-*\n"
+" $ echo \"deb http://mirror/debian sid main\" > config/archives/sid.list.chroot\n"
+" $ cat >> config/chroot_apt/preferences << END\n"
+" Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit\n"
" Pin: release n=sid\n"
" Pin-Priority: 600\n"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:342
+#: en/user_customization-packages.ssi:344
#, no-wrap
msgid ""
" Package: *\n"
@@ -1097,7 +1104,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:346
+#: en/user_customization-packages.ssi:348
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 "
@@ -1108,7 +1115,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:352
+#: en/user_customization-packages.ssi:354
#, no-wrap
msgid ""
" Package: gnome-keyring\n"
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 584fe85..d25e59f 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -2,10 +2,16 @@
1~about-manual Sobre esse manual
-O principal objetivo deste manual é servir como único ponto de acesso para
-toda a documentação relacionada ao projeto Debian Live. Ele não inclui
-documentação do usuário para usar o sistema Debian Live nem sobre as coisas
-que são Live específicas.
+This manual serves as a single access point to all documentation related to
+the Debian Live project and in particular applies to the software produced
+by the project for the Debian 6.0 "Squeeze" release. While it is primarily
+focused on helping you build a live system and not on end-user topics, an
+end-user may find some useful information in these sections: {The
+Basics}#the-basics covers preparing images to be booted from media or the
+network, and {Customizing run time
+behaviours}#customizing-run-time-behaviours describes some options that may
+be specified at the boot prompt, such as selecting a keyboard layout and
+locale, and using persistence.
Alguns comandos mencionados no texto devem ser executados com privilégios de
super-usuário, que podem ser obtidos tornando-se usuário root via #{su}# ou
@@ -19,19 +25,21 @@ respectivamente. Esse simbolo não é parte do comando.
While we believe that everything in this manual is important to at least
some of our users, we realize it is a lot of material to cover and that you
may wish to experience early success using the software before delving into
-the details. Therefore, we have provided three tutorials in the
-{Examples}#examples section designed to teach you image building and
-customization basics. Read {Using the examples}#using-the-examples first,
-followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
-image}#tutorial-3. By the end of these tutorials, you will have a taste of
-what can be done with Debian Live. We encourage you to return to more
-in-depth study of the manual, perhaps next reading {The basics}#the-basics,
-skimming or skipping {Building a netboot image}#building-netboot-image, and
-finishing by reading the {Customization overview}#customization-overview and
-the chapters that follow it. By this point, we hope you are thoroughly
-excited by what can be done with Debian Live and motivated to read the rest
-of the manual, cover-to-cover.
+the details. Therefore, we suggest reading in the following order. First,
+read this chapter, {About this manual}#about-manual, from the beginning and
+ending with the {Terms}#terms section. Next, skip to the three tutorials at
+the front of the {Examples}#examples section designed to teach you image
+building and customization basics. Read {Using the
+examples}#using-the-examples first, followed by {Tutorial 1: A standard
+image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and
+finally {Tutorial 3: A personalized image}#tutorial-3. By the end of these
+tutorials, you will have a taste of what can be done with Debian Live. We
+encourage you to return to more in-depth study of the manual, perhaps next
+reading {The basics}#the-basics, skimming or skipping {Building a netboot
+image}#building-netboot-image, and finishing by reading the {Customization
+overview}#customization-overview and the chapters that follow it. By this
+point, we hope you are thoroughly excited by what can be done with Debian
+Live and motivated to read the rest of the manual, cover-to-cover.
2~terms Terminologia
@@ -127,7 +135,7 @@ _* Richard Nelson
_* Trent W. Buck
-2~ Contribuindo com esse documento
+2~how-to-contribute Contribuindo com esse documento
This manual is intended as a community project and all proposals for
improvements and contributions are extremely welcome. The preferred way to
@@ -178,7 +186,7 @@ code{
}code
-3~ Aplicando patches
+3~ Applying changes
Diretamente cometer ao repoitório é possivel por qualquer um. No entanto,
nós pedimo que você mande maiores mudanças para a lista de e-mail para
@@ -190,11 +198,11 @@ _* Obter a chave publica de commit:
code{
$ mkdir -p ~/.ssh/identity.d
- $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
- -O ~/.ssh/identity.d/gitosis at live.debian.net
- $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
- -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
- $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
+ $ wget http://live.debian.net/other/keys/git@live.debian.net \
+ -O ~/.ssh/identity.d/git at live.debian.net
+ $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \
+ -O ~/.ssh/identity.d/git at live.debian.net.pub
+ $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*
}code
@@ -205,8 +213,8 @@ code{
$ cat >> ~/.ssh/config << EOF
Host live.debian.net
Hostname live.debian.net
- User gitosis
- IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
+ User git
+ IdentityFile ~/.ssh/identity.d/git at live.debian.net
EOF
}code
@@ -215,9 +223,11 @@ _* Fazer o checkout de um clone do manual por ssh:
code{
- $ git clone gitosis at live.debian.net:/live-manual.git
+ $ git clone git at live.debian.net:/live-manual.git
+ $ cd live-manual && git checkout debian-next
-}code
+}code _* Note that you should commit any changes on the debian-next branch,
+not on the debian branch.
_* Depois de editar os arquivos no manual/en/, por favor chame o alvo
'commit' no nível superior do diretório para higiênizar os arquivos e
@@ -229,10 +239,18 @@ code{
}code
-_* Depois de higiênizar submeta as mudançãs. Escreva mensagens de submissão,
-que consistem em sentanças completas úteis, começando por letra maiuscula e
-acabando com uma parada total. Normalmente iniciando com as formas
-'Fixing/Adding/Removing/Correcting/Translating'.
+_* Then
+
+code{
+
+ $ git add .
+
+}code
+
+_* After sanitizing and adding the files, commit the changes. Write commit
+messages that consist of full, useful sentences in English, starting with a
+capital letter and ending with a full stop. Usually, these will start with
+the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
code{
@@ -248,7 +266,7 @@ code{
}code
-3~ Translation
+3~translation Translation
To submit a translation for a new language, follow these three steps:
@@ -262,5 +280,8 @@ _* Once the new language is added, you can randomly start translating all po
files in #{manual/po/}#.
_* Don't forget you need #{make commit}# to ensure the translated manuals
-are updated from the po files, before #{git commit -a}# and #{git push}#.
+are updated from the po files and then you can review your changes launching
+#{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
+and #{git push}#.
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 08f82d1..b5822e0 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Project <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-01-25
+ :published: 2012-03-08
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index dddfe30..d799847 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -187,6 +187,8 @@ environments and some special purpose lists, as well as standard lists the
others are based upon. You can also provide your own package lists, or use a
combination of both.
+*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.
+
3~ Predefined package lists
The simplest way to use lists is to specify one or more predefined lists
@@ -541,19 +543,20 @@ and #{aptitude}# for details.
For background, please first read the #{apt_preferences(5)}# man page. APT
pinning can be configured either for build time, or else for run time. For
the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/apt/preferences}#.
+#{config/chroot_local-includes/etc/apt/preferences}#..
-Let's say you are building a Squeeze live system but need all #{live-*}#
-packages to be installed from Sid at build time. You need to add Sid to your
-APT sources and pin it so that only the packages you want are installed from
-it at build time and all others are taken from the target system
-distribution, Squeeze. The following will accomplish this:
+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
+time. You need to add Sid to your APT sources and pin it so that only the
+packages you want are installed from it at build time and all others are
+taken from the target system distribution, Squeeze. The following will
+accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
- Package: live-*
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << END
+ Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index de0b33b..8a68da1 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -2,10 +2,16 @@
1~about-manual Despre acest manual
-Scopul principal al acestui manual este de a accesa intreaga documentatie a
-proiectului Debian Live intr-un singur loc. Dar aici nu vor fii gasite
-documantatii pentru utilizatorul final cu exceptia celor legate de sistemul
-live.
+This manual serves as a single access point to all documentation related to
+the Debian Live project and in particular applies to the software produced
+by the project for the Debian 6.0 "Squeeze" release. While it is primarily
+focused on helping you build a live system and not on end-user topics, an
+end-user may find some useful information in these sections: {The
+Basics}#the-basics covers preparing images to be booted from media or the
+network, and {Customizing run time
+behaviours}#customizing-run-time-behaviours describes some options that may
+be specified at the boot prompt, such as selecting a keyboard layout and
+locale, and using persistence.
Anumite comenzi din text trebuie sa fie executate ca 'super_utilizator',
privilegiu care poate fi obtinut fie prin comanda #{su}, sau #{sudo}. Pentru
@@ -17,19 +23,21 @@ a distinge intre acesti utilizatori se vor folosi #{$}# respectiv #{#}#
While we believe that everything in this manual is important to at least
some of our users, we realize it is a lot of material to cover and that you
may wish to experience early success using the software before delving into
-the details. Therefore, we have provided three tutorials in the
-{Examples}#examples section designed to teach you image building and
-customization basics. Read {Using the examples}#using-the-examples first,
-followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
-browser utility}#tutorial-2 and finally {Tutorial 3: A personalized
-image}#tutorial-3. By the end of these tutorials, you will have a taste of
-what can be done with Debian Live. We encourage you to return to more
-in-depth study of the manual, perhaps next reading {The basics}#the-basics,
-skimming or skipping {Building a netboot image}#building-netboot-image, and
-finishing by reading the {Customization overview}#customization-overview and
-the chapters that follow it. By this point, we hope you are thoroughly
-excited by what can be done with Debian Live and motivated to read the rest
-of the manual, cover-to-cover.
+the details. Therefore, we suggest reading in the following order. First,
+read this chapter, {About this manual}#about-manual, from the beginning and
+ending with the {Terms}#terms section. Next, skip to the three tutorials at
+the front of the {Examples}#examples section designed to teach you image
+building and customization basics. Read {Using the
+examples}#using-the-examples first, followed by {Tutorial 1: A standard
+image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and
+finally {Tutorial 3: A personalized image}#tutorial-3. By the end of these
+tutorials, you will have a taste of what can be done with Debian Live. We
+encourage you to return to more in-depth study of the manual, perhaps next
+reading {The basics}#the-basics, skimming or skipping {Building a netboot
+image}#building-netboot-image, and finishing by reading the {Customization
+overview}#customization-overview and the chapters that follow it. By this
+point, we hope you are thoroughly excited by what can be done with Debian
+Live and motivated to read the rest of the manual, cover-to-cover.
2~terms Termeni
@@ -124,7 +132,7 @@ _* Richard Nelson
_* Trent W. Buck
-2~ Cum se poate contribui la acest document
+2~how-to-contribute Cum se poate contribui la acest document
Acest manual este conceput ca un proiect comunitar si astfel orice
propozitie sau inbunatatire sunt bune venite. Principala cale de a face o
@@ -174,7 +182,7 @@ code{
}code
-3~ Aplicarea de patch-uri
+3~ Applying changes
Commiterea in direct este la indemana oricui. Totusi, va rugam sa trimeteti
schimbarile mai mari , spre discutie , la mailing list. Pentru a fi trimise
@@ -185,11 +193,11 @@ _* Fetch the public commit key:
code{
$ mkdir -p ~/.ssh/identity.d
- $ wget http://live.debian.net/other/keys/gitosis@live.debian.net \
- -O ~/.ssh/identity.d/gitosis at live.debian.net
- $ wget http://live.debian.net/other/keys/gitosis@live.debian.net.pub \
- -O ~/.ssh/identity.d/gitosis at live.debian.net.pub
- $ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*
+ $ wget http://live.debian.net/other/keys/git@live.debian.net \
+ -O ~/.ssh/identity.d/git at live.debian.net
+ $ wget http://live.debian.net/other/keys/git@live.debian.net.pub \
+ -O ~/.ssh/identity.d/git at live.debian.net.pub
+ $ chmod 0600 ~/.ssh/identity.d/git at live.debian.net*
}code
@@ -200,8 +208,8 @@ code{
$ cat >> ~/.ssh/config << EOF
Host live.debian.net
Hostname live.debian.net
- User gitosis
- IdentityFile ~/.ssh/identity.d/gitosis at live.debian.net
+ User git
+ IdentityFile ~/.ssh/identity.d/git at live.debian.net
EOF
}code
@@ -210,9 +218,11 @@ _* Checkout un clon al manualului prin ssh:
code{
- $ git clone gitosis at live.debian.net:/live-manual.git
+ $ git clone git at live.debian.net:/live-manual.git
+ $ cd live-manual && git checkout debian-next
-}code
+}code _* Note that you should commit any changes on the debian-next branch,
+not on the debian branch.
_* After editing the files in #{manual/en/}#, please call the 'commit'
target in the top level directory to sanitize the files and update the
@@ -224,10 +234,18 @@ code{
}code
-_* Dupa 'sanitizare' 'commit' schimbarile. Scrieti mesajele de commit, care
-constau in propozitii clare, care incep cu litere Mari, si se incheie cu
-punct si sens. Inceputul poate fii de forma
-'Fixing/Adding/Removing/Correcting/Translating':
+_* Then
+
+code{
+
+ $ git add .
+
+}code
+
+_* After sanitizing and adding the files, commit the changes. Write commit
+messages that consist of full, useful sentences in English, starting with a
+capital letter and ending with a full stop. Usually, these will start with
+the form 'Fixing/Adding/Removing/Correcting/Translating', e.g.
code{
@@ -243,7 +261,7 @@ code{
}code
-3~ Translation
+3~translation Translation
To submit a translation for a new language, follow these three steps:
@@ -257,5 +275,8 @@ _* Once the new language is added, you can randomly start translating all po
files in #{manual/po/}#.
_* Don't forget you need #{make commit}# to ensure the translated manuals
-are updated from the po files, before #{git commit -a}# and #{git push}#.
+are updated from the po files and then you can review your changes launching
+#{make build}# before #{git add .}#, #{git commit -a -m "Translating..."}#
+and #{git push}#.
+*{Note:}* Please be aware that even though both #{make commit}# and #{make build}# remove your build directory, if you build the manual to review your changes as recommended, you may want to clean your git tree before pushing. In order to do that, you can use #{make clean}#. This last step is not compulsory thanks to the .gitignore file but it is a good practice to avoid committing files involuntarily.
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 08f82d1..b5822e0 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -5,11 +5,11 @@
@creator: Debian Live Project <debian-live at lists.debian.org>
@rights:
- :copyright: Copyright (C) 2006-2011 Debian Live Project
+ :copyright: Copyright (C) 2006-2012 Debian Live Project
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-01-25
+ :published: 2012-03-08
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index dddfe30..d799847 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -187,6 +187,8 @@ environments and some special purpose lists, as well as standard lists the
others are based upon. You can also provide your own package lists, or use a
combination of both.
+*{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.
+
3~ Predefined package lists
The simplest way to use lists is to specify one or more predefined lists
@@ -541,19 +543,20 @@ and #{aptitude}# for details.
For background, please first read the #{apt_preferences(5)}# man page. APT
pinning can be configured either for build time, or else for run time. For
the former, create #{config/chroot_apt/preferences}#. For the latter, create
-#{config/chroot_local-includes/etc/apt/preferences}#.
+#{config/chroot_local-includes/etc/apt/preferences}#..
-Let's say you are building a Squeeze live system but need all #{live-*}#
-packages to be installed from Sid at build time. You need to add Sid to your
-APT sources and pin it so that only the packages you want are installed from
-it at build time and all others are taken from the target system
-distribution, Squeeze. The following will accomplish this:
+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
+time. You need to add Sid to your APT sources and pin it so that only the
+packages you want are installed from it at build time and all others are
+taken from the target system distribution, Squeeze. The following will
+accomplish this:
code{
- $ echo "deb http://mirror/debian sid main" > config/chroot_sources/sid.chroot
- $ cat >>config/chroot_apt/preferences <<END
- Package: live-*
+ $ echo "deb http://mirror/debian sid main" > config/archives/sid.list.chroot
+ $ cat >> config/chroot_apt/preferences << END
+ Package: live-boot live-boot-initramfs-tools live-config live-config-sysvinit
Pin: release n=sid
Pin-Priority: 600
--
live-manual
More information about the debian-live-changes
mailing list